Adjusted default settings for testpage.
Added applicationname, applicationsecret and allication id to property files.
Merge branch 'master' of https://github.com/altran/Whydah-SecurityTokenService

Conflicts:
	src/main/resources/securitytokenservice.PROD.properties
	src/main/resources/securitytokenservice.TEST.properties