Support for Vaadin 7.1
Version 2.2.1
Merge remote-tracking branch 'henrikerola/2.0' into 2.0

Conflicts:
	ivy.xml