Allow 14-07-14
Merge remote-tracking branch 'origin/master'

Conflicts:
	EditorProject/Assets/Editor/AllowableDistanceEditor.cs
	EditorProject/Assets/Script/AllowableDistance/AllowableDistance.cs