UI for file upload
Changed label
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	pom.xml
Merge branch 'development' of https://github.com/Elthiryel/TWO-ABDMS into development