temp commit
Merge branch 'master' of https://github.com/aixiaoxianggithub/bigdo.git

Conflicts:
	src/com/bigdo/app/MainMeBll.java