v1.0 commit
Merge branch 'branch_nomessage'

* branch_nomessage:
  v1.0 commit

Conflicts:
	src/com/example/aademo/BaseActivity.java