update
Merge branch 'master' of https://github.com/khushbug-optimus/Hackathon

Conflicts:
	Hackathon/elFinder.MVCTest/Controllers/ConnectionController.cs
	Hackathon/elFinder.MVCTest/Scripts/UploadFile.js
	Hackathon/elFinder.MVCTest/Views/Home/Index.cshtml