fixed BombEnemy + hpbar, fixed getNeighbour()
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/Enemy.cpp