Added simple login/logout for build-in user "marek" with password "aaaa"
(not loaded from DB yet).
Added login.jsp.
User.java merged.
Added login/logout, profile and several minor changes.
Merge branch 'registration' of https://github.com/FengLee/A7B36SI2.git
into registration

Conflicts:
	naKup/src/main/java/com/cvut/naKup/domain/User.java