Add Stage class (not working)
Prepare for Merge
Merge remote-tracking branch 'origin/base' into quiz

Conflicts:
	Zend/Zend/Enums.h
	Zend/Zend/Level.h
Merge remote-tracking branch 'origin/quiz' into base