ivo
Merge branch 'master' of https://github.com/galic1987/sbctu
Merge branch 'master' of https://github.com/galic1987/sbctu

Conflicts:
	sbctu/src/main/java/tuwien/sbctu/models/GuestGroup.java
merg