update
Merge branch 'master' of https://github.com/luanjunyi/cortana

Conflicts:
	util/__init__.py