Merge branch 'dev'
Merge branch 'dev'
Merge pull request #8 from rohaus/master

Fix tagging mechanics
Implement proximity checks for powerups and spawn.
Update README.md
Remove respawn and powerup circles when in distance.
Merge branch 'master' of https://github.com/RebootJeff/phone-tag-phonegap
Merge pull request #9 from lkaina/master

proximity checks working for respawn
Merge branch 'dev'

Conflicts:
	www/js/models/game.js
	www/js/models/map.js