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

Conflicts:
	web/db.sqlite3
	web/polls/admin.pyc
	web/polls/emoa.pyc
	web/polls/interface.pyc
	web/polls/views.pyc
	web/polls/world.pyc
	web/service/models.pyc