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

Conflicts:
	modules/api.js
Merge branch 'master' of github.com:samuelchen/gagein-web-new

Conflicts:
	pages/web/home/home_controller.js