Fixed super ultra wierd router problem
Merge branch 'master' into templating