tried to fix timeslot validation within event time (julie work)
fixed merge conflicts in models and event controller
added stylesheets and simpleform work
deleted datetimepicker
finally figured out how to work with neat
fixed merge confict in event.rb