Merge branch 'test1' of https://github.com/Yichou/libMrpoid.git

Conflicts:
	src/com/mrpoid/app/BaseActivity.java
Merge branch 'master' of https://github.com/Yichou/libMrpoid.git

Conflicts:
	src/com/mrpoid/app/BaseActivity.java