commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	midana/midana.v11.suo
	midana/midana/bin/midana.dll
	midana/midana/bin/midana.pdb
	midana/midana/obj/Debug/midana.csprojResolveAssemblyReference.cache
	midana/midana/obj/Debug/midana.dll
	midana/midana/obj/Debug/midana.pdb