Commit
Merge branch 'master' of https://github.com/MiniYellow/AndroidDev.git

Conflicts:
	RopeOne/bin/classes/.gitignore
	RopeOne/gen/.gitignore
	RopeOne/src/com/whwt/load/LoadActivity.java