merge bio-webapp and bio-webapp-test

because it was untidy