Merge conf header with main nav bar

Applies this from Jan: https://github.com/owncloud/www/issues/87

@jospoortvliet