fixed #35
Merge branch 'master' of https://github.com/Zhinsta/Zhinsta

Conflicts:
	1/zhinsta/static/css/media.css