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