some local changes
Merge branch 'master' of https://github.com/anshul-malhotra/widget-box
changes
Merge branch 'master' of https://github.com/anshul-malhotra/widget-box

Conflicts:
	webapp/FileUpload_Dialog.aspx.cs