fixed errors
Merge branch 'master' of https://github.com/ellipsis21/GCJ

Conflicts:
	Basic Tasks Prototype/grouphome.php
	Basic Tasks Prototype/manage.php