Added new file and modified some file into civischool
Modified submenu name of school tab and added code for cancel button redirect back to Conference Advisor List
Added conference booking end date from database in place of hard coded value Apr 8th

Conflicts:
	org.civicrm.school/School/Utils/Conference.php
Merge pull request #15 from pratikshad/sfschoolcommit

Sfschoolcommit