make header layout
Merge branch 'develop' of https://github.com/rogerbaer/aap-tool into develop

Conflicts:
	app/view/MainHeader.js