Build errors fixed for Visual Studio 2010.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

Conversion to VS2013.