ed
Merge branch 'feature_2' of https://github.com/dloveao-test/test4git.git into feature_2

Conflicts:
	src/com/fx/he/MyGroupView.java