fixes a bug in the new ES form so that the user's email is shown if they don't have a name
Fixes merge conflicts in _form.html.haml for ES
Removes time of day and end time from ES db table, adds category field to ES db table, adds dinner or drinks option in new ES form
Adds a default name to ES depending on category chosen by user and adds validation to ensure a category is chosen upon ES creation
Puts the form into bootstrap's grid system but styling is incomplete
Merge branch 'master' into stef