Merge pull request #12 from mpetris/master

latest features and bugfixes
Merge pull request #13 from mpetris/master

latest features and bugfixes
Merge remote-tracking branch 'mpetris/vaadin7' into vaadin7
Merge remote-tracking branch 'mpetris/vaadin7' into vaadin7
Merge pull request #109 from catmadevel/vaadin7

Vaadin7