Updated list for users and file details
Merge branch 'master' of https://github.com/sumantmurke/AirBox

Conflicts:
	src/main/java/com/AirBox/rest/UploadFileService.java