Merge branch 'master' of https://github.com/sumantmurke/DropHere

Conflicts:
	src/main/java/com/drophere/controller/FileController.java
	src/main/java/com/drophere/controller/HomeController.java
	src/main/java/com/drophere/facade/FileFacade.java
	src/main/java/com/drophere/facade/FileFacadeImpl.java