Lots of good stuff. Needs lots of cleanup. Facebook events not working yet. Just committing so I don't lose progress.
Merge branch 'master' of github.com:yeapiekiyay/CityScene

Conflicts:
	app/View/Pages/index.ctp
	app/tmp/logs/error.log