index manager
Merge remote-tracking branch 'origin/master'

Conflicts:
	miniSQL/miniSQL/miniSQL.vcxproj
	miniSQL/miniSQL/miniSQL.vcxproj.filters