marketing
Merged 'develop'.

Conflicts:
	app/views/layouts/_footer.html.erb
Merge pull request #2 from roleme/feature/conflict

Feature/conflict