Merge pull request #35 from CTcue/tests

Added environment tests and user functionalities
Account and User View template now merged into Account
Merge pull request #36 from CTcue/merge-account-and-view-user-template

Account and User View template now merged into Account
Updated locales