Edition of generator class
Merge branch 'master' of https://github.com/arya-project/project-arya

Conflicts:
	code/site/kernel/Generator.class.php