updated settings for static files
Merge branch 'master' of https://github.com/mavroskardia/swcoffee

Conflicts:
	coffee/coffee/settings.py
all latest ui tweaks and settings changes