world scrolling
merge with jorand/maelle
resolution conflit