Completed Most of The Entry Part
Merge branch 'master' of https://github.com/rpsailo/diet

Conflicts:
	application/models/School.php