Merge branch 'master' of https://github.com/abalabokhin/BFB

Conflicts:
	Assets/Standard Assets/Scripts/BFB Scripts/ShipMovement.cs
	BFB-csharp.sln
	BFB.sln
	Library/assetDatabase3