Merge branch 'dev-taskym-misc' of https://github.com/taskym/nZEDb into taskym-dev-taskym-misc

Merge
Restructure Classes
Perms.
Added AEBN.
Merge branch 'dev' into dev-taskym-misc

Conflicts:
	nzedb/controllers/XXX.php
Merged XXX.php
Updated Regex
Merge branch 'dev-taskym-misc' of https://github.com/taskym/nZEDb into taskym-dev-taskym-misc

Merge taskym into taskym
Merge branch 'taskym-dev-taskym-misc' into dev

Merge taskym into dev
Merge taskym's XXX changes PR
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev-tmuxrevamp

Merge dev into revamp