Edit profile, edit client, date display, minor changes.
merge from develop (CSS) part.
Merge branch 'non-css' into develop