Security Bots now spawn near Vending Machines and remain inactive unless you attack it or the vending machine
Merge remote-tracking branch 'origin/master'

Conflicts:
	astro_demo/src/Ai.cpp