config lib
Merge branch 'master' of https://github.com/dongwq/droid-util

Conflicts:
	droid-util.iml