fixed date format string
Merge branch 'master' of github.com:osiam-dev/osiam

Conflicts:
	authorization-server/src/main/java/org/osiam/ng/resourceserver/SingularFilterChain.java