removed UserCriteria parameter from IOptimization
adapted Optimization component to new interface
Added java_json and junit
Add constructor in Restaurant class
getting correct restaurant changed
add map dispaly in UI
corrected PT  inconsistencies
replaced UserCriteria from Optimization componenet
Merge branch 'backend' of https://github.com/faisalmoeen/TimePlanner.git into backend
Merge branch 'backend' of https://github.com/faisalmoeen/TimePlanner into backend

Conflicts:
	TimePlanner/JavaSource/de/tuberlin/hdis14/core/Optimization.java
corrected corrupted file
switch back