Merge branch 'master' of https://github.com/ladnyik/TestGitHub.git

Conflicts:
	VaadinTest/src/com/example/vaadintest/VaadintestUI.java
test
.
Merge remote-tracking branch 'origin/master'
.
Merge branch 'master' of https://github.com/ladnyik/TestGitHub.git

Conflicts:
	VaadinTest/src/com/example/vaadintest/VaadintestUI.java