aaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyBook/src/com/clear/mybook/MainActivity.java
aaa