Finish first page
Merge branch 'evaOnePage' into evaContinueFirstPage

Conflicts:
	app/styles/css/newStyle.css
	config.codekit