added avatar support
Merge branch 'refs/heads/avatar_support'
typo fix
added WEBSITE_URL to settings
persistant home page, username in settings
changed text
redirect after avatar upload
setting popup 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
Update menu.inc.html
Avatar Text
restored css
Merge branch 'master' of github.com:PilasterDigital/cwist
Merge branch 'master' of github.com:PilasterDigital/cwist
Merge branch 'master' of github.com:PilasterDigital/cwist

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

Conflicts:
	web/cwist/static/css/base.css