OSNG-11 - fixed unit tests, removed unused imports, fixed client
Merge remote-tracking branch 'origin/master'

Conflicts:
	authorization-server/src/main/java/org/osiam/ng/resourceserver/dao/UserDAO.java
OSNG-11 - fixed unit tests, fixed location header problem