Remove Uri and things related to atom that were not used
Merge branch 'gem' into mweb-v2

Conflicts:
	app/models/uri.rb
	lib/action_controller/agents.rb
	lib/action_controller/station.rb
	lib/action_controller/station_resources.rb
	lib/action_view/helpers/station_helper.rb
	lib/active_record/resource.rb
	lib/station/core_ext.rb
	lib/station/html.rb