Merge branch 'master' into jonas

Conflicts:
	.gitignore
Debugging PHYSFS_enumerateFiles issue
Fix for regular file list, disabling texture manager for now
Merge branch 'master' into jonas

Conflicts:
	.gitignore
	templates/init.lua
Investigation what is going on with stale physics objects
Ensure double deletion is prevented
Adding a few more assert calls
New tragically epic song
Fixing object deletion crash related to the new edge shapes
Merge branch 'jonas'