merge galvão, wordpress seo funcionando com qtranslate
Merge branch 'master' of github.com:brunomarks/starter-theme-wordpress

Conflicts:
	.DS_Store