Added MyUI class in myproject
Added MyUI after conflict...
Merge branch 'develop' of https://github.com/ctoncelli/vaadin-tests into develop

Conflicts:
	myproject/src/com/example/myproject/MyUI.java
Merge branch 'develop' of https://github.com/ctoncelli/vaadin-tests.git into develop