Conflict resolving
Merge branch 'jsonp-support'

Conflicts:
	admin-service/pom.xml
Fixes #259