new
update
Merge branch 'master' of https://github.com/wangym/android-common

Conflicts:
	.travis.yml