Show state "location" nicely.
Merge branch 'develop' into non-css
some changes with contacts and report, try to display the profile picture and member name by using a angular directive , but it doesn't work, will do some more investigate.
Merge branch 'develop' into non-css
Merge branch 'non-css' into develop