* Use spring javaconfig instead of xml
* Upgrade vaadin and addons