Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
Use correct URL for note details
Get the note browse pages into a vaguely working state
Add next/previous tooltips for browsing notes
Enable the note later when going from the browser to the map view
First pass at banishing the words "bug" and "OpenStreetBugs"
Tidy up some insanity in the creating of new notes
Move the marker with the mouse when positioning a note
More cleanup work on the notes javascript
Remove the notes control

The control existed to allow creation of notes by clicking on the map
but as we're not doing that we don't need it.
Turn on the note layer when adding a note
Merge branch 'master' into openstreetbugs
Allow the format to be selected for note API responses
Improve formatting of note descriptions in GPX and RSS responses
Merge branch 'master' into openstreetbugs
Return GeoJSON for notes when JSON format is requested
Rework notes interface using OpenLayers and rails
Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
MapBoundary no longer exists
Bounding boxes are sanitised on creation now