Merge branch 'master' of /home/wallner/workspace/osiam/connector4java with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/org/osiam/client/query/UserQueryBuilderTest.java
Added the Query class
refactor query
added sortOrder enum