Dev branch of Ushahidi_Web for rjmackay