Merge branch 'feature/populate' into develop
Renamed Item model to StoreItem
Changed store_item buy_price to price
Revert "Changed store_item buy_price to price"

This reverts commit 4f01559f0656756ac57cfae7085c962eecdccfd1.
Changed buy_price to purchase_price
Added pricing models and user groups

Added models for store item prices, as well as
a model for user groups.
Improvements. This commit fails testing.
Controllers and testing

Added admin user controllers, did some modifications to
pricing controllers, added access restrictions, added tests
for access restrictions.
Bootstrap working with responsive ui
added slider for featured games on home page
added featured field to compos

this will be used for displaying certain games on the front page in the
slider
Merge branch 'develop' into feature/layout

Conflicts:
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	spec/models/compo_spec.rb
sliders now displays featured compos
Greatly improved testing speed

This patch greatly improves the speed of the rspec tests by
not generating a new bcrypt hash for the test user in every new test.
Merge branch 'develop' into feature/layout
tables properly styled
all tests pass
modularising the population scripts
populating store_items and games complete
split up populate scripts