Merge branch 'master' of https://github.com/aralco/acredito

Conflicts:
	src/main/java/com/bo/acredito/MyVaadinUI.java