Merge from dev
Merge branch 'dev'

Conflicts:
	build/jquery.checkboxes.min.js
JavaScript formatted.