Merge pull request #91 from jateeter/master

put: response.setContentType(MediaType.APPLICATION_ATOM_XML_VALUE);
Merge pull request #92 from jateeter/master

Bug Fix: https://www.pivotaltracker.com/story/show/66468534
Changed name of AdminController to avoid conflict with OAuth2
configuration file.