Refactored activity script.
Merge branch 'master' of https://github.com/genxium/PlayHongKongResort

Conflicts:
	public/javascripts/activity/functions.js