changed develop branch to master for os2web repo
Added file lock and file convertion manager dependencies