Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/pwr/suspy/service/UserService.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/includes/header.jsp
	src/main/webapp/WEB-INF/jsp/user.jsp