various small changes, added light Beam for home base
git merge conflict resolution

Conflicts:
	Assets/Projectiles/BigShell.prefab
	Assets/Projectiles/Enemy Bullet.prefab
	Assets/Projectiles/Shell.prefab
	Assets/Scenes/Main.unity
	HelicopterGame-csharp.sln
	HelicopterGame.sln
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/21/216db01b9c5bf7c4aa31715505ea6970
	Library/metadata/29/29ffa7d64f3218a4d82dce784e7fbd59
	Library/metadata/a9/a944ab20703ad4c1ba6f2d508e7bcf9f