Css menú principal, y pie página
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/stratos_theme/css/global.css