OSNG-1 separated spring-servlet.xml into client-authentication.xml,
resource-server.xml, user-authentication.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	authorization-server/src/main/webapp/WEB-INF/spring-servlet.xml