Resolved conflicts
Merge branch 'master' of github.com:gitahi86/openmrs-module-filemanager
Added code to save files.
Minor commit
Fixed conflicts
Merge branch 'master' of github.com:gitahi86/openmrs-module-filemanager
Minor edits
Merge branch 'master' of github.com:gitahi86/openmrs-module-filemanager
Added logic to generate file list.
Cleaned up gsp