Merge origin/master

Conflicts:
	CMS/src/main/java/pl/edu/pjwstk/cms/controllers/LoginController.java
	CMS/src/main/webapp/WEB-INF/dispatcher-servlet.xml