Added other settings
Merge branch 'refs/heads/feature-index-settings' into develop

Conflicts:
	catalog/static/scripts/main_c.js
css corrections