Merge branch 'master' of https://github.com/pandatautau/Fusion-Engine

Conflicts:
	.gitignore
update