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
Use jsonify to create JSON for notes so that it is properly formatted
Move notes resources to assets directory
Deselect note features when the popup is closed
Merge branch 'master' into openstreetbugs

Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
Drop with_format and user the new :formats render option instead
Include the event type in the JSON output of a note
Make setting of a default status for new notes work
User errors.add(:base) instead of the removed errors.add_to_base()
Fix mass assignment issues
Update schema
Remove redundant routes and add default format specifiers
Update note controller tests for new GeoJSON output
Fix some bugs found by the note controller tests
Get the per-user note list view working again
Merge branch 'master' into openstreetbugs

Conflicts:
	config/routes.rb
	db/structure.sql
Restructure notes URLs according to standard rails conventions