login
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal
muell
Merge commit 'a1e7028deb8085b3353a7cac21a2bada55dda19c'

Conflicts:
	build/classes/dao/CamDaoImpl.class