Merge pull request #140 from jianling/dev-refactor

修改demo聚合页
调整button, 添加watch
resolve conflict
update Gruntfile
Merge branch 'dev-refactor' of https://github.com/gmuteam/GMU into dev-refactor

Conflicts:
	Gruntfile.js