config server

config server
server
Merge branch 'master' of https://github.com/quatrosem/Bangkok__WEB

Conflicts:
	web/db.sqlite3
	web/polls/emoa.pyc
	web/polls/views.pyc
	web/service/game_thread.pyc
	web/service/models.pyc
	web/service/rungame.pyc
	web/service/views.pyc
	web/web/urls.pyc
Arrumando getArea