Merge branch 'master' of https://github.com/CE-KMITL-OOAD-2014/online_shopping_system
trying to deploy
Merge branch 'master' of https://github.com/CE-KMITL-OOAD-2014/online_shopping_system
add some extra xss protection, fix some promotion adapter bug
Merge branch 'develop' of https://github.com/CE-KMITL-OOAD-2014/online_shopping_system
reconfig database file
add restapi
Merge branch 'feature/restapi' of https://github.com/CE-KMITL-OOAD-2014/online_shopping_system
fix extre semicolon bug
fix pdf conflict