scene list ready
Merge branch 'origin/dev'

Conflicts:
	main.lua
Merge branch 'master' into dev
remove LuisHerranz from .gitmodules and point to the correct app commit