update
Merge branch 'master' of https://github.com/alelifaithCabahug/gradAdvising

Conflicts:
	application.properties
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/application.properties
	target/classes/gradadvising/Enrollments.class
	target/classes/gradadvising/EnrollmentsController.class
	target/classes/gradadvising/Grade.class
	target/classes/gradadvising/GradeController.class
	target/classes/gradadvising/Program.class
	target/classes/gradadvising/ProgramController.class
	target/classes/gradadvising/Student.class
	target/classes/gradadvising/StudentController.class
	target/classes/gradadvising/Subject.class
	target/classes/gradadvising/SubjectController.class
	target/classes/gradadvising/YearSem.class
	target/classes/gradadvising/YearSemController.class
	target/classes/resources.class