Add media and UshahidiUI module back after merge