Highlighting current user if attending meal, and changed occupations list
Working friends button
meal info now shows self and friends
Merge branch 'highlightSelf' of https://github.com/nfeliciano/mangiamo into highlightSelf
commit
meFactors and something else
fixed merge conflicts with UID
minor cosmetic changes to friends
Merge branch 'master' into highlightSelf

Conflicts:
	app/client/js/controllers/main-controller.js
	app/client/views/login.html
	app/client/views/main.html
Negation change.  Avoid negation where possible.
more minor UI changes to main.html - specifically the intro blurb
Merge branch 'highlightSelf' of https://github.com/nfeliciano/mangiamo into highlightSelf
small push small change for clarity
.... more minor ui changes. And I commented out google login.
Merge branch 'highlightSelf' of https://github.com/nfeliciano/mangiamo into highlightSelf
Merge pull request #119 from nfeliciano/highlightSelf

Highlight self
Merged with master and resolved conflicts and removed a console.log