Merging from dev
Pages should redirect properly after Admin tool or User setting shenanigans
Found two more changes for the bug.
Setting up editing stuff
Merging with bug fix
Merge pull request #76 from Venture-TheSphinxTeam/chanelsbranch

Chanelsbranch