add boss bitmask
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/Enemy.cpp
	Classes/Enemy.h
	Classes/GameScene.cpp
	Classes/ResourceManager.h