** Fixed bug in dmp diff algorithm that caused all data patches to be
marked as conflicts
** Fixed bug in file update that caused extension patches to crash on
npe
** Fixed a bug in file patch that caused "null" to be appened into the
file after first data patch
** Fixed a bug in file patch that caused file to be for ever in same
state
** Changed file join to use file's contentType instead of hard coded one