Fix Time woun't shown
More features
Merge remote-tracking branch 'origin/fixtime'

* origin/fixtime:
  Fix Time woun't shown

Conflicts:
	app/models/reservation.rb