use correct name for signal connect
use new Qt connect syntax for compile-time checks
merge upstream/master into andrew/inertia
gun.js correctly deletes voxel again on collision
bumpSettings on load/stop script
merge upstream/master into andrew/inertia

Conflicts:
	interface/src/Application.cpp
remove warnings about signed-unsigned comparison
Merge pull request #2679 from AndrewMeadows/inertia

fix particle-vs-voxel collision callbacks in gun.js