CMake and Visual Studio temp files added to .gitignore
Merge branch 'develop' into json_server

Conflicts:
	.gitignore