CSS
Merge branch 'master' of github.com:PilasterDigital/cwist

Conflicts:
	web/cwist/static/css/base.css
Merge branch 'master' of github.com:PilasterDigital/cwist