sync finish

sync finish
Merge remote-tracking branch 'origin/master'

Conflicts:
	Planner/Scheduler.dat
	Planner/bin/Planner.class
	Planner/bin/View/AddDialog$5.class
	Planner/src/Planner.java
	Planner/src/View/MiniBrowserView.java