Commenting debugging code
Merge branch 'develop' of github.com:HashCookies/goaprop into develop
Changes to edit page as per new page & updated email property to friend link in property page