update
Merge branch 'master' of https://github.com/nguoianphu/html5_phaser1

Conflicts:
	www/js/game.min.js