Merge branch 'origin/master'
Merge with master
Various changes to abstract resource structure.
Added Attributes but these are not currently tied into any UI.
Reusable template page so templates can be shown in more appropriate pages.
Fixed i18n message conversion in events.
Latest changes to authentication architecture broke the test.
Slight architecture change so we can determine if an authentication module succeeded after calling logon.
Added method isAuthenticatorInScheme to check if an authentication scheme contains a particular authenticator.
Clean up of some warnings
Better caching of properties.
locale was not cached correctly.
Put groups back to EAGER for now.
Merge branch 'origin/develop'