Merge branch 'master' of http://81.70.224.233:10080/yichael/web

# Conflicts:
#	index.html
#	static/js/index.1191a906.js
#	static/js/index.81a7a9f0.js
#	static/js/index.8b49d942.js