added app folder
app directly added
Merge branch 'master' of https://github.com/gitahi86/openmrs-module-filemanager
file manager service
changes for conflicts