Merge branch 'dev' into responsive

author Yoan Le Clanche <yoan@ellington.pilotsystems.net>

Mon, 8 Oct 2018 15:01:31 +0000 (17:01 +0200)

committer Yoan Le Clanche <yoan@ellington.pilotsystems.net>

Mon, 8 Oct 2018 15:01:31 +0000 (17:01 +0200)
author Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Mon, 8 Oct 2018 15:01:31 +0000 (17:01 +0200)
committer Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Mon, 8 Oct 2018 15:01:31 +0000 (17:01 +0200)
diff --cc teleforma/static/teleforma/css/teleforma.css
Simple merge
author	Yoan Le Clanche <yoan@ellington.pilotsystems.net>
	Mon, 8 Oct 2018 15:01:31 +0000 (17:01 +0200)
committer	Yoan Le Clanche <yoan@ellington.pilotsystems.net>
	Mon, 8 Oct 2018 15:01:31 +0000 (17:01 +0200)