razrješavanje konflikata
Merge branch 'master' of https://github.com/C2V3N/termin.git

Conflicts:
	termin-web/src/main/java/com/acme/termin/controller/HomeController.java
	termin-web/src/main/webapp/WEB-INF/spring/security-context.xml
	termin-web/src/main/webapp/WEB-INF/views/home.jsp