Merge pull request #36 from jateeter/master

End of Step 5
Clear JSP warnings
Merge pull request #37 from dfcoffin/master

Clear JSP warnings
corrected datacustodian selection to display datacustodianId instead of thirdPartyApplicationName
Merge pull request #38 from MartyBurns/master

corrected datacustodian selection to display datacustodianId instead of thirdPartyApplicationName
corrected authorizations screen to display dadataCustodianId instead of thirdparty application
Merge pull request #39 from MartyBurns/master

corrected authorizations screen to display dadataCustodianId instead of thirdparty application
added devmysql-regeneratedatabase profile which uses mysql but always regenerates the database from the internal source code model. note:thirdparty database is not correct as generated and has duplicate keys and links
Merge pull request #40 from MartyBurns/master

added devmysql-regeneratedatabase profile which uses mysql
Add <spring-security-oauth.version> constant
Correct spelling of version
Clean up "authorizationURI" element processing in authorization record
revert to older data for dev profile
Merge pull request #41 from MartyBurns/master

revert to older data for dev profile
Merge branch 'master' of https://github.com/energyos/OpenESPI-ThirdParty-java
1. Update Third Party authorization record with oauth access token
related fields
2. Update Third Party authorization record "status" field to indicate
ACTIVE or DENIED
3. Properly handle OAuth error response to /oauth/authorization endpoint
request
- Update authorization structure during OAuth processing
- Display AuthorizationList screen if an access token has been issued
for the requested Scope (eliminates duplicate authorization records)
- Delete invalid authorization records (i.e. OAuth process never
completed during a previous attemtp)
- Correct jsp errors
- Remove unused config file reference
Merge pull request #42 from dfcoffin/master

Re-merge previous changes
fixed compile errors and put @Ignore in
AuthorizationControllerTests.java