Updated submodules and added svn-merge tool