Fix remnants of old code
Update addons ajax
Update routes
Merge branch 'master' into hlarsen-master