new logo.png, css, and base temp
Merge branch 'master' of https://github.com/novawebdevelopment/aea

Conflicts:
	aeacms/static/css/global.css
	aeacms/templates/base.html