Gera ezek azok
Merge branch 'master' of http://github.com/lestarcdog/B2iHealthcare.git

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