jquery change
Merge pull request #5 from cschaffner/les.style-2

jquery change
replacing pipeline with compressor
squashed team migration
Merge branch 'master' into refactor

Conflicts:
	www/settings.py