130514 start
Merge branch 'master' of https://github.com/iddqt/Sharpshooter

Conflicts:
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SharpShooter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SharpShooter/Library/assetDatabase3
	SharpShooter/Library/metadata/c7/c7de9ffafa529f04b9890cdd04069b0f
	SharpShooter/Library/metadata/e7/e75929f5ccf9d8c47b1ae03b9bd6adb1
	SharpShooter/Library/metadata/f5/f52fb77b383326b44adb47167927e62c
===== 130414 11:40PM =====