Footnotes::Extensions::Routes::filtered_routes no longer uses Hash#diff, which is deprecated in Rails 4
Merge branch 'master' of github.com:tommireinikainen/rails-footnotes

Conflicts:
	lib/rails-footnotes/notes/routes_note.rb