about to change View/Layer
time sync
pre-merge
Merge branch 'dev' into ggj

Conflicts:
	src/main/scala/demos/swifts/states/MenuState.scala
	src/main/scala/scalene/core/View.scala
UNKNOWN COMMIT