Merge branch 'master' of https://github.com/Pixelrocket/ZAPP

Conflicts:
	src/app/main.lua
Login ge-deactiveerd