Merge branch 'master' into live
Merge branch 'master' into live
fixed build
Merge branch 'master' into live

Conflicts:
	build/build.xml
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'sf-master' into sf-live
Merge branch 'sf-master' into sf-live
Merge branch 'sf-master' into sf-live
hotfix to fix #103 (again)

This fixes a bug that occurs when someone is a member of a project that has no activity
Merge remote-tracking branch 'scriptfo/master' into sf-live

Conflicts:
	src/index.php
	src/models/dto/ActivityListDto.php
hotfix
Merge branch 'sf-master' into sf-live

Conflicts:
	src/index.php
	src/libraries/shared/Website.php
Merge branch 'sf-master' into sf-live
Merge branch 'sf-master' into sf-live
Fix bug #105

Email invitation template was in the wrong directory.
Add other missing templates for Jamaican Psalms

Besides adding new users, other email templates were also missing, such
as the one needed when new users try to sign up. This commit adds all
the other missing email templates, with phrasing generally based on the
phrasing in the "You've been invited to join the project" template.