New css to go with it
Merge pull request #701 from gannetson/fransie-front-end

New css to go with it
Some kind words
Fixed FMO page styling
Merge pull request #702 from gannetson/translations

Some kind words
Merge pull request #703 from gannetson/fransie-front-end

Fransie front end
Merge remote-tracking branch 'upstream/master'

Conflicts:
	static/global/css/screen.css