linux workspace
Merge branch 'master' of https://github.com/kubasz/ballxworld

Conflicts:
	bin/autorun.lua
Fixed default arguments