Facebook SDK installed.
Facebook SDK installed.

Merge branch 'master' of github.com:yeapiekiyay/CityScene

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map