proxy - geoserver admins should be able to login
Merge branch '14.01' into 14.06

Conflicts:
	security-proxy/src/main/webapp/WEB-INF/applicationContext-security.xml