zaznaczenie brancha
a
Merge branch 'nicraM' into Adescom

Conflicts:
	templates/login.html