fix some problems, change some tactics..
Merge branch 'devel'
some better atack tactics and defence base