merge
merge
merge
merge
merge
Merge branch 'master' of https://github.com/BinbinTang/EagleEye.git

Conflicts:
	EagleEye/src/eagleeye/view/WorkBenchControllerAdvanced.java