Issue #82: Include locale when registering OAuth info.
Clean up.
Merge branch '#82/include-locale-when-registering-oauth-info' into develop