Fix remnants of old code
Update addons ajax
Update routes
Merge remote-tracking branch 'upstream/master'