更新通讯录
Merge branch 'master' of https://github.com/SeekArt/android_iphone

Conflicts:
	js/email.js