Yup
Merge branch 'master' of
https://github.com/Oigusportaal/oigusportaal.git

Conflicts:
	WebContent/Admin.jsp