My new change
Merge branch 'master' of github.com:yuva27/SampleDNet

Conflicts:
	SampleDNet/Default.aspx