Import from Vaadin Project
Updated Java Version to 1.8