Issues resolved
Merge branch 'master' of git://github.com/chris91/ExamScheduler

Conflicts:
	logging/log.txt
	src/data/Optimizer.java
	src/ui/ApplicationFrame.java
	src/ui/ExamSchedulerMain.java
	src/ui/RunHistory.java
	src/ui/panels/ApplicationPanel.java
	src/ui/panels/SchedulerRunningPanel.java