test fast-forward conflict
set play button positions
set play button positions 2
landscape menu
Merge branch 'master' of https://github.com/nielk/nantes-nord

Conflicts:
	src/assets/styles/main.css
some stuffs
ended

some stuffs