minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes.rpy
Merge pull request #48 from DoumanAsh/master

Correction of order handling