fdxvd
Merge branch 'master' of https://github.com/Elejdor/projectStarsWar

Conflicts:
	project/Library/CurrentLayout.dwlt
	project/Library/assetDatabase3
	project/Library/expandedItems
	project/Library/guidmapper