delta
Merge branch 'master' of github.com:vcelloho/Research

Conflicts:
	EISPC/Models/HourSelectionProblem/log/messages.log