salto
Merge branch 'master' of https://github.com/ospfranco/monkeygames-hackathonlp

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
Merge branch 'master' of https://github.com/ospfranco/monkeygames-hackathonlp