small changes
Merge branch 'master' of https://github.com/sumantmurke/AirBox

Conflicts:
	src/main/java/com/AirBox/Dao/DbConnection.java
	src/main/java/com/AirBox/rest/UploadFileService.java
	target/classes/com/AirBox/rest/UploadFileService.class