replaced UserCriteria from Optimization componenet
Merge branch 'backend' of https://github.com/faisalmoeen/TimePlanner into backend

Conflicts:
	TimePlanner/JavaSource/de/tuberlin/hdis14/core/Optimization.java