adding items to the ae generate system
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/JR_ae_generate.py