Changes for security class
Merge branch 'master' of github.com:GrimmOutlook/bstore

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock

Merging security class stuff with hard reset previously made