options
Merge remote-tracking branch 'origin/morlord'
hero
Merge remote-tracking branch 'origin/morlord'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unityproject/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
Merge branch 'master' of https://github.com/morlord/BFS

Conflicts:
	Unityproject/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unityproject/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
Merge remote-tracking branch 'origin/Nerzull'