Added description and notes fields; global properties
Merge branch 'master' of github.com:gitahi86/openmrs-module-filemanager

Conflicts:
	omod/src/main/java/org/openmrs/module/filemanager/page/controller/FileManagerPageController.java