Merge remote-tracking branch 'chris/develop'

Signed-off-by: karsanrichard <karsanrichard@gmail.com>

Conflicts:
	application/modules/home/controllers/home.php
	application/modules/home/models/registration.php
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology

Conflicts:
	application/modules/home/controllers/home.php
	application/modules/home/models/registration.php
error reporting and admin emailing
Content and home styled.
Login working but username and info not displayed after login
Logout also works fine for admin

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
admin mail-users
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
pulls commits
Merge branch 'master' of https://github.com/karsanrichard/PhilosophicalAnthropology into develop
Admin made dynamic

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
no message

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Merge remote-tracking branch 'josh/develop'
no message

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
ghjkl
Merge branch 'develop' of https://github.com/karsanrichard/PhilosophicalAnthropology into develop
mychanges