encode url
Merge branch 'master' of heroku.com:maxiskao
Merge branch 'master' of heroku.com:maxiskao

Conflicts:
	util.py