changed background color
Merge branch 'master' of github.com:novawebdevelopment/aea

Conflicts:
	aeacms/static/css/global.css