Refine standard toggle
Merge remote-tracking branch 'origin/develop' into standard-toggle-refine

Conflicts:
	dist/js/bootstrap.min.js