remove reference to enemyGenerator from enemy using callback
merge master