Just notes.
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy
Temporarily remove 'invitation' functionality.
Outings now reference actual user IDs for their creators.
Formatting for dates in outings list.
Outings creator now referenced by FB id, not app id.
Outings display creator name (not ID), but without referencing ID.
yml updated
updated package.json
Outings now store creator name & id, attendee names & ids.
Outing attendee names now list.
Outing attendee list & join functionality test OK w/ prepop data.
Merging upstream master down in prep for merge of 'outings' branch.

Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy
Merge branch 'outings'

Conflicts:
	app/styles/main.css
	config/handler.js
	server.js
Join button hides if attending outing, not just organized it.
Minor syntax/style.
Correct date format on fake outing in DB.
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy
Merge branch 'master' of https://github.com/janaspage/moviebuddy into janaspage-master

Conflicts:
	app/scripts/controllers/friends.js
	config/db_config.js
	config/handler.js