This merges branch 'master' of oak.sfconservancy.org:npo-acct Resolving Conflicts: ExistingProjects/EvaluationTemplate.mdwn There didn't seem to be any real conflicts there, but auto-merger got confused.