Build up all the jsp pages
Build up all the jsp pages
Merge origin/master

Conflicts:
	WEat/web/index.html