Added timeUnitCollection back.
Merge branch 'add_price_to_rental_period' into develop