Pundit Testing complete
basic bullet integration
policy and ArticlesController specs 100%
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	Gemfile
	app/controllers/articles_controller.rb
	app/models/article/template.rb