Done 1336
Merge branch 'master' into 1336_awesome_feature

Conflicts:
	index.html