Resolve strange dropdown problem
Resolve merge conflict on header.xhtml
Merge branch 'master' of github.com:synapticon/hwoffice

Conflicts:
	hwoffice-layout/src/main/resources/META-INF/resources/layout/application/header.xhtml