andis scheiss
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal

Conflicts:
	src/dao/UserDaoImpl.java
gay
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal