Merge pull request #94 from ChristianMurphy/develop

User functionality improved, Profiles unified