Fixed location reloads in adminjs
Merge branch 'master' of https://github.com/connyz/cms2