Merge branch 'master' of https://github.com/KernelCorp/sneg

Conflicts:
	app/models/posts/post.rb
	features/admin.feature
	features/step_definitions/admin_steps.rb