Chagned SimpleBullet to BulletBase
Merge branch 'alex' of github.com:AlexHayton/UnityTestProject2

Conflicts:
	Assets/JimWest/Prefabes/Weapons/Pistol.prefab
	Assets/JimWest/Scenes/test.unity
	Assets/JimWest/Scripts/Weapons/WeaponScript.cs
Checked in and fixed new rifle and pistol prefabs
Changed Main Menu, added ButtonStyle stub
Fixed bullet rotation and hit (use Tag Bullet)
Added new bullet tracer
Fixed SelfTest for weapons
Merge branch 'refs/remotes/origin/master'
Added self test mechanism.
Added show in editor to GUI elements.
Added new GUIMenu script.
Splitted ExtraEntites
Made a new GUIStylePrefab class, so all GUI elements can be styled in common ways
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
New GUI stuffs
More GUI stuff.
Fixed ButtonStyle.prefab
some changes to the main menu
Added layers to the GUI code
Fixed the buttons!
Added transparency (via a Color class) and lockScaleRatio

Added a transparency and general selector. Added lockScaleRatio, which
is on by default and makes the x/y scale proportionally.