Merge branch 'editor'

Conflicts:
	Fractile.depend
	Fractile.layout
Merge branch 'master' of https://github.com/jensenr30/Fractile