hotosm 2 hbogner

Geting latest changes