.
Merge branch 'master' of github.com:samuelchen/gagein-web-new

Conflicts:
	config.js
	modules/api.js
	pages/web/home/home.html