minify scripts and css
Merge branch 'dev'
minify scripts and css
Merge branch 'dev'

Conflicts:
	labs/static/css/labs.css
minify scripts and css
Merge branch 'dev'
Merge branch 'dev'
minify scripts and css
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
minify scripts and css
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	labs/static/js/labs.js
	students/static/css/students.css
	templates/static/css/style.css
minify scripts and css
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	students/static/css/students.css
minify scripts and css
Merge branch 'dev'

Conflicts:
	students/static/css/students.css
minify scripts and css