Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel

Conflicts:
	Application/ENG-Schedule-Planner/project.properties