add
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/jerome/base/BaseActivity.java