finished servery apis except meals
updated serveries and servery api
updated time to show rice regardless of user timezone - ready to work on menu database
'finished' meals api
added pagecontent
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
fixed bugs
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
Changed setup.py to point to the same database
temp commit
merge conflicts
change format
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
individual servery api
Updated opening_hours format to a more convenient one
merge conflicts
trying to edit mobile version
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev

Conflicts:
	app/static/views/main.html
merge conflicts
fixed all except 1) meals are duplicated in meal api for some reason 2) north and south serveries do not show up in api even though the IDs are the same