Test assets updated
Merge branch 'master' of https://github.com/yonote/engine

Conflicts:
	.gitignore