merged
dev changes
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	TestVaadinOnJBoss/src/com/example/testvaadinonjboss/TestvaadinonjbossUI.java
merged
Merge pull request #3 from mustaffah/dev

Dev