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

Conflicts:
	app.js
	config.js
	controller.js
	pages/web/home/home.html
	widgets/web/common/header/header.html