Cleaned up trailing whitespace
Cleaned up trailing whitespace
Cleand up trailing whitespace in html files
Cleaned up trailing whitespace
Merge pull request #22 from MacLemon/whitespace-cleanup

Whitespace cleanup
Use staticfiles app for assets.
Merge branch 'django_1_4_compatibility' of https://github.com/Metalab/mos into django_1_4_compatibility

Conflicts:
	metalab/templates/admin/base.html
	metalab/templates/base.html
	metalab/templates/cellardoor.html
Merge branch 'django_1_4_compatibility' of github:Metalab/mos into django_1_4_compatibility

Conflicts:
	metalab/templates/admin/base.html