Merge commit '0ee2798061c074b0237713ea9d2c81524a2939f0' into develop
Add .gitignore
Add property sheets
Merge commit 'cc49ecec3c2d3b5401ece2b4915d1d32b818119f' into develop

Conflicts:
	src/CoreEngine.cpp
	src/TVTest.vcxproj