Update logo and menu
Merge branch 'master' of github.com:online-ventures/mce

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb