Merge branch 'master' of https://github.com/tm1508/woboNew.git

Conflicts:
	housing/WebContent/VAADIN/themes/housing/addons.scss
	housing/src/com/example/housing/HousingUI.java
Merge branch 'master' of https://github.com/tm1508/woboNew.git