Merge pull request #93 from jateeter/master

Changed name of AdminController to avoid conflict with OAuth2
Merge pull request #94 from jateeter/master

Changed packages in the Authorization Server .xml file to agree with new
Uncommented OAuth2 Filter and Added /Subscription to the protected
Pattern