Moved menu bar on top in topology. Fixed vaadin maven plugin in pom.
Merge branch 'vaadin-7-upgrade' of https://github.com/OpenNMS/opennms into vaadin-7-upgrade