Fixed bug in Ability Factory where it will explode if it cannot find the ability
Merge branch 'master' into marathon