Final Fixes Part 2
Merge branch 'master' of https://github.com/matthewdeeco/dcs_student_profiler

Conflicts:
	application/models/edit_database_model.php