Merge remote-tracking branch 'upstream/v1.1' into yamlloader
Import CWS localization list
Merge branch 'yamlloader' into lmio2015
User self-registration.
Merge branch 'registration' into lmio2015