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

Conflicts:
	project/Library/CurrentMaximizeLayout.dwlt
	project/Library/metadata/14/14395343f66ca3249b616c61dc329956