Logo, 2 Headers and some tabs...
Merge remote-tracking branch 'origin/master'

Conflicts:
	share-a-flat/src/main/webapp/css/main.css
	share-a-flat/src/main/webapp/pages/template/header.jsp