Merge branch 'master' into develop
Added the credential manager and the accounts tool.
Updated version number to reflect changes
Conflict resolution
Conflict resolution.