2013-11-16 0:29:19
Merge branch 'master' of https://github.com/Yichou/libMrpoid.git

Conflicts:
	project.properties
	src/com/mrpoid/app/BaseActivity.java
	src/com/mrpoid/app/EmuService.java
	src/com/mrpoid/app/ExternActivity.java
	src/com/mrpoid/app/SmsReceiver.java