Merge pull request #3 from rohaus/master

Correct icon positioning
Reimplement in phonegap.
Merge branch 'devLeig'

Conflicts:
	www/js/main.js
	www/js/models/game.js
	www/js/models/map.js
	www/js/templates/game.js
	www/js/templates/home.js
	www/js/templates/join.js
	www/js/views/AppView.js
Hide labels on map and decrease zoom max
Merge branch 'master' of https://github.com/RebootJeff/phone-tag-phonegap
Refactor map code
Merge pull request #4 from lkaina/master

Add game powerups and respawn.
Merge branch 'master' of https://github.com/RebootJeff/phone-tag-phonegap
Edit bugs with merge