x64 builds
Merge remote-tracking branch 'origin/master'

Conflicts:
	Builds/VisualStudio2012/Dexed.vcxproj
	Builds/VisualStudio2012/Dexed.vcxproj.filters