Combinig AddPlace and AddTimeSlots forms into one.
Merge branch 'master' into AddPlaceFrom