updated Vaadin 7.1.12
Merge pull request #27 from christoph-frick/vadin_7_1_12

updated to Vaadin 7.1.12
Merge remote-tracking branch 'upstream/master'
update to vaadin 7.1.14