double check for solidity removed
Merge branch 'master' of https://github.com/jbmorse/Dragonfly

Conflicts:
	Dragonfly_Engine/WorldManager.cpp
Made boss fights more interesting