#46 - admin with player blocking
Merge branch 'master' of https://github.com/marshallshen/mangos-to-mangos into feature/admin

Conflicts:
	client/main.html
	client/views/main/lobby.html
#46 - merge fix
#46 - merging
Merge branch 'master' of https://github.com/marshallshen/mangos-to-mangos into feature/admin

Conflicts:
	client/templates/lobby.js
#46 - removing unneeded admin.js code
Merge branch 'master' of https://github.com/marshallshen/mangos-to-mangos into feature/admin

Conflicts:
	server/game.js
#46 - fixing pregame count
Merge pull request #72 from nhsieh/feature/admin

#46 - admin with player blocking