Changed name of AdminController to avoid conflict with OAuth2
configuration file.
Merge pull request #93 from jateeter/master

Changed name of AdminController to avoid conflict with OAuth2
Merge branch 'master' of http://github.com/energyos/OpenESPI-DataCustodian-java