Convert trace counting to use modern arel methods
Convert some deprecated methods to modern arel syntax
Fix typo
Improve consistency of selections in the browser controller
Add a basic test for browse#note
Update to iD v1.2.1
Adding internationalization in links share and layers.
Merge remote-tracking branch 'upstream/master'