Merge branch 'frontday' Closes #761

Conflicts:
	dist/js/bootstrap-select.js.map
	dist/js/bootstrap-select.min.js