kkkkkk
Merge remote-tracking branch 'origin/master'

Conflicts:
	Planner/bin/View/AddDialog$2$1.class