Step 1 toward pages
Merge branch 'master' into pages

Conflicts:
	app/models/post.rb
Facebook pages, yo
Merge branch 'master' into pages

Conflicts:
	app/models/post.rb