commented out bad line of code due to OAuth library change; non-used function
Merge pull request #97 from MartyBurns/master

commented out bad line of code due to OAuth library change; non-used fun...
removed service_kind table from database and corresponding initializations
Merge pull request #98 from MartyBurns/master

removed service_kind table from database and corresponding initializatio...
 Change ListTokensForUser method to support new findByClientIdAndUserID
Merge remote-tracking branch 'upstream/master'
Merge pull request #99 from MartyBurns/master

Incorporate Don's Change ListTokensForUser method to support new findByClientIdAndUserID
1) Create third_party_admin and data_custodian_admin clientId entries
Merge branch 'master' of
http://github.com/dfcoffin/OpenESPI-DataCustodian-java into HEAD

Conflicts:
	src/main/java/org/energyos/espi/datacustodian/oauth/OauthAdminController.java