game circle
Merge branch 'master' of https://github.com/softdevelop/palodrive

Conflicts:
	trunk/app/Controller/SignUpsController.php
	trunk/app/webroot/js/custom.js