update
Merge branch 'master' of https://github.com/peteshand/blaze

Conflicts:
	src/blaze/model/viewPort/ViewPort.as