Merge branch 'master' into ZipFiles

Conflicts:
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/collector/activities/ProjectManagerActivity.java