test
changed git ignore
Merge branch 'Dev'

Conflicts:
	CacheUtil.Console/bin/Debug/CacheUtil.Console.vshost.exe
no message
Merge branch 'Dev'

Conflicts:
	.gitignore