Fixed incorrect Location address use.
Merge branch 'master' into gutted_april_launch
Updated contact email address.
Implemented survey