v0.3.0-dev
Merge remote-tracking branch 'origin/v0.3.0-dev'

Conflicts:
	client/asset/js/controller/index.js
	client/index.html
	db/rooms/Lobby.json
	helpers.js
	package.json
	server.js
minor bug fixes