OSNG-1 some autodoc stuff
Merge branch 'autodoc'

Conflicts:
	authorization-server/src/main/java/org/osiam/ng/resourceserver/RestAttribute.java
Merge remote-tracking branch 'origin/master'
OSNG-1 java-doc stuff
OSNG-1 enhanced example with bearer example
Merge branch 'master' of github.com:osiam-dev/osiam