User profile editing + etc.
Merge remote-tracking branch 'origin/master'
Fixed dates being reset and ordering