Merge branch 'refs/heads/BS3' into BS3-SU

Conflicts:
	js/modal.js
	less/mixins/grid.less

Merge branch 'refs/heads/BS3' into BS3-SU

Conflicts:
	js/modal.js
	less/modals.less

Merge branch 'refs/heads/BS3' into BS3-SU

Fix bug

Merge remote-tracking branch 'upstream/master' into BS3-SU

version 3.0.0.4

version 3.0.0.3

Version 3.0.0.2

Version 3.0.0.1

Version 3.0.1