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
cleanup file layout/format
add list of project themes to ProjectListDTO
moved rights folder
updated use statements
move test to reflect test subjects moved location