Merge pull request #1 from Collaboratr/GriffsBranch

Merge branch 'master' into GriffsBranch
Merge branch 'master' of https://github.com/Collaboratr/collaboratrMain

Conflicts:
	.meteor/packages
Merge branch 'master' of https://github.com/Collaboratr/collaboratrMain

Conflicts:
	.meteor/packages
moved the Facebook login to top right

Ryan fix the misaligned
delete MY PHOTO
Revert "delete MY PHOTO"

This reverts commit 88df53ad77bb3d508a87102113058e098e4aeb6e.
deleted again
oooooo
Merge branch 'master' into GriffsBranch

Conflicts:
	client/profile/profile.html