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.
Merge pull request #85 from marcel-blonk/develop

Fixes for mood tracker
Test of some stuff not well covered by the UI tests, and changes based on the tests.
Test of some stuff not well covered by the UI tests, and changes based on the tests.
Merge pull request #86 from alxdarksage/develop

Test of some stuff not well covered by the UI tests, and changes based o...
Should be in git but is not for some reason.
These need to change to fix the build
Merge pull request #87 from alxdarksage/develop

Fixing build with files that seem to have disappeared in git