added chat headline, changed headline colour in diary
hid show age, changed diary
changed viewNote
Merge branch 'master' of https://github.com/Hyperactivity/android-app