Fix error
Fix?
Merge branch 'master' of https://github.com/SEGVeenstra/daktari

Conflicts:
	flash/src/core/screen/Screen.as