fixed tests
Add CrucialVoxel and colorcoding of it
input cleaup
Merge branch 'master' into voxel_explosions

Conflicts:
	data/config.ini
Formatting
More formatting
Refactoring
merge with master
add crucial voxel to planet
Merge pull request #178 from voxelinc/code_crucial

Add CrucialVoxel and colorcoding of it
Merge branch 'master' of https://github.com/voxelinc/voxellancer into voxeltreenode-ref-in-voxel

Conflicts:
	src/voxel/specialvoxels/cockpitvoxel.h
	src/voxel/specialvoxels/enginevoxel.h
	src/voxel/specialvoxels/fuelvoxel.h
Merge branch 'master' into clean_input

Conflicts:
	src/ui/inputhandler.cpp
Fix missing rotation part
Merge pull request #181 from voxelinc/clean_input

input cleaup
Merge branch 'master' into voxel_explosions

Conflicts:
	data/config.ini
	src/ui/inputhandler.cpp
come on...
Rename Particle class, default density to 3
Merge pull request #174 from voxelinc/voxeltreenode-ref-in-voxel

Add VoxelTreeNode Pointer to Voxel, speeds up removal from CollisionDetector
move explosions to voxeleffect/
Merge branch 'master' into voxel_explosions

Conflicts:
	data/config.ini