typo fix
Image / Style Changes
Merge remote-tracking branch 'oldrepo/master'
Merge branch 'master' of github.com:PilasterDigital/cwist

Conflicts:
	web/cwist/static/css/base.css
	web/cwist/templates/parent/menu.inc.html