Added support for #city to allow direct referal to a city and bookmarking
Re-enabled marker on contact page. Problem with positioning in Firefox was fixed in v30
Merge remote-tracking branch 'origin/master'