fixed merge

git-svn-id: http://svn.unog.un.org/svn/cbm/cbm/trunk@641 5eafb63e-3ce9-0410-9386-45365aa604ab
Merge branch 'master' of https://github.com/djkevin/cbm