Refactored.
Merge branch 'develop' of https://github.com/genxium/PlayHongKongResort into develop

Conflicts:
	app/controllers/SQLCommander.java