New Branch Base adapted as per TFS 2012
Merge remote-tracking branch 'Pustakalay/master'

Conflicts:
	.gitignore