Footer alliance
Merge branch 'master' into newDispo

Conflicts:
	styles/main.min.css