added new logo
Merge branch 'develop' of git://github.com/cjking/gea into cjking-develop

Conflicts:
	web/assets/styl/main.styl