Merge branch 'master' of https://github.com/UNGPublic/sampleng-backend into cas-oauth2

Conflicts:
	src/main/java/ungp/sampleng/backend/resource/CondutorResource.java
	src/main/webapp/WEB-INF/spring-security.xml