Update API 18
Update api 18
Merge branch 'master' of https://github.com/yixia/ZI

# By Crossle Song
# Via Crossle Song
* 'master' of https://github.com/yixia/ZI:
  Update api 18
  Update API 18

Conflicts:
	build.gradle