Merge branch 'AI'
Merge branch 'AI'
Working enemy shield regen
Merge branch 'master' into AI