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