Update vaadin version to 7.3
Merged master fixed conflict.