added tracker_id to reverse args in edit_tracker_url to fix a NoReverseMatch when trying to edit a tracker's url
Merge branch 'master' of https://github.com/openhatch/oh-mainline into 855