intermediate state on shields
another intermediate on shields
intermediate
begin compinfo
merge with master; add shield-label to hud
remove genericshield
componentsinfo added
merge with master
adjusted shieldlabels
fixed @xchrdws concerns
Merge branch 'master' of https://github.com/voxelinc/voxellancer into maxRange

Conflicts:
	src/resource/worldobjectbuilder.cpp
	src/worldobject/worldobject.cpp
glow
merge complete
Add virtual to overriden methods
Merge pull request #611 from voxelinc/add_virtual_again

Add virtual to overriden methods
merge with master
removed some iostream includes
Merge branch 'master' of github.com:voxelinc/voxellancer into transparency2
made objects that aren't rendered beautifully when transparent opaque again
some formating