making a cron job
Merge branch 'master' into backgroundJobs
Fixed adding meal times at proper times.  You can now add meals at different times then when you are currently at.
In progress, DOES NOT COMPILE
every 15 minutes, we check the database for meals already passed, and remove those
Sidebar is now functional in terms of opening and closing properly.  It should also always load the same no matter where you come from.
Merge pull request #89 from nfeliciano/backgroundJobs

Background jobs
Fixed problem with populatemealbuddies() closing the sidebar.
Merge pull request #93 from nfeliciano/friends_sidebar_ui

Friends sidebar ui
Initial branch merge to create server branch
Added the user modal to allow developers to talk to the user through a modal
Added generalized user messages.
the scheduler is now in a different file, and now removes the meal from the user's 'mealsAttending'
removing commented out code
changed the interval to be right before the minutes begin, so as to give a buffer
Merge pull request #102 from nfeliciano/schedulerChanges

scheduler changes
Merge pull request #100 from nfeliciano/user_help

seems to work
Merge branch 'master' into leaveMeal

Conflicts:
	app/client/css/main.css
	app/client/js/controllers/main-controller.js
	app/client/views/index.html
	app/client/views/main.html
	app/server/controllers/meals-controller.js
Merge pushes and minor changes