Merge .gitattributes changes from develop branch
fixed text files
fixed line endings
fixed line endings
fixed README
removed no longer needed files
fixed .gitignore for .unsuccessfulbuild
merge develop into master
Resolve conflicts

All "confilcts" were actually diffs - not sure why git flew off the
handle.
Merge remote-tracking branch 'upstream/master' into develop
* remove shadow warnings
Conflicts:
	JSON/testsuite/src/JSONTest.cpp