Update to Vaadin CDI 1 beta3
Windows -> Unix newlines
Use Valo