bumped versions of fom and mapbender including feature/testing merges