Merge pull request #40 from rohaus/master

Fix merge bugs
Merge pull request #41 from rohaus/master

Fix incorrect property names
Fix random powerup drop timer.
Fix pacman random spawn timer.
Merge branch 'master' of https://github.com/RebootJeff/phone-tag into dev
Merge pull request #42 from lkaina/master

Add pacman class and fix timers
Merge branch 'master' of https://github.com/RebootJeff/phone-tag into dev

Conflicts:
	config/socket/game.js