big mess
Merge branch 'master' of https://github.com/coolBean/eclipseZhaoYang.git

Conflicts:
	src/com/bean/dao/MyEclipseClass.java