New
Merge branch 'evaContinueFirstPage' of https://github.com/Lhuihui/confplusapp into evaContinueFirstPage

Conflicts:
	app/styles/css/newStyle.css