Merged kinect, activities and map

Maps not showing yet