questions and admin dashboard
admin
Merging with chris
conflict
Conflicts
seth
dbv
Changes to admin page
Merge branch 'master' of https://github.com/karsanrichard/PhilosophicalAnthropology into develop

Conflicts:
	application/config/autoload.php
	application/modules/admin/controllers/admin.php
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop

Conflicts:
	application/config/autoload.php
	application/modules/admin/controllers/admin.php
	application/modules/admin/views/admin_home.php
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/admin/views/admin_home.php
merges
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/admin/views/admin_home.php
mail function
Changes to admin home page
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/questions/views/public_questions.php
Changes to instructor and admin pages
Merge branch 'master' of https://github.com/karsanrichard/PhilosophicalAnthropology into develop