Some hack here and there
Merge branch 'master' of https://github.com/danielpacak/com.danielpacak.osgi.web.console.vaadin7