Happy New Year
Merge branch 'development' into gh-pages

Conflicts:
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
Conflicts fixed