fix fix

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@15355 3db68df2-c116-0410-a063-a993310a9797
Marker objects for Atlas

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@15356 3db68df2-c116-0410-a063-a993310a9797
Fix error for entities that require a technology to be trainable.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@15357 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'
Merge branch 'master' into balance