Merge commit
Merge branch 'master' of https://github.com/MarkoMilojevic/4Rockets

Conflicts:
	Skadios/Library/CurrentLayout.dwlt
	Skadios/Library/assetDatabase3
	Skadios/Library/guidmapper
	Skadios/Skadios-csharp.sln
	Skadios/Skadios.sln
merge commit
Merge branch 'master' of https://github.com/MarkoMilojevic/4Rockets

Conflicts:
	Skadios/Assembly-CSharp-vs.csproj
	Skadios/Assembly-CSharp.csproj
	Skadios/Library/CurrentLayout.dwlt
	Skadios/Library/assetDatabase3
	Skadios/Library/guidmapper
	Skadios/Skadios-csharp.sln.orig
	Skadios/Skadios.sln.orig
	Skadios/Skadios.userprefs
Glupavi merge i glupi gitignore i sve nek ide u majcinu.