No really, a fix for ProfileController and the four failing tests.
Merge pull request #84 from alxdarksage/develop

No really, a fix for ProfileController and the four failing tests.