Installed 'deface' gem
Installed spree product images for portable computer
Set sprockets-rails so that it doesn't upgrade from version 2.1.3 and break spree
Added sqlite3 to dev group, pg and rails_12factor to production group, updated gems
Merge branch 'layout'

Conflicts:
	Gemfile