11111111
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/posts_controller.rb
	app/views/posts/index.html.erb
11111111