Added HgInorefile
Merge branch '1.2' into 1.1
Merge branch '1.1'

Conflicts:
	.gitignore : Merged all details in gitIgnore file