Pre testing.
Removed notices.
Added user picture to profile.
Resolving conflicts.
Cleaning up user profile js file.
Merging.
After merge of some things.
WIP
Merge remote-tracking branch 'origin' into UF-234
WIP
Merge pull request #142 from Webcraft-Myplanet/UF-234

Uf 234
Merge with latest master to resolve conflicts