Porting app to TK-4.0.rc1 and Vaadin-7.3.0.rc1