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

Conflicts:
	web/service/models.pyc
Merge branch 'master' of https://github.com/quatrosem/Bangkok__WEB