armor renderer changes
Merge branch 'master' of https://github.com/AstroTeam/Astro

Conflicts:
	astro_demo/src/Ai.cpp