Merge branch 'release/1.0.0'
Merge branch 'release/2.0.0'
Update from Nicolas
Good tweet handle for Simon
Merge https://github.com/zufrieden/uxlausanne into dev
Correct minor typos:
* Simon Tweet handle
* Nicolas nova teaser (typo + worong expression
Merge branch 'dev' of https://github.com/gillesdemarty/uxlausanne into dev

Conflicts:
	src/talks.php
Change la copie de :ratio
Afficher le CTA en permanance
Merge branch 'dev' of github.com:zufrieden/uxlausanne into dev