Merge branch 'hotfix/validate-presence-of-shop'
upgrade to ruby 2.1.1
change repo_url from ssh to https
apply rails security patch
lock sprockets version
update gems
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
refactor CategorySearch
add NamedStringIO
add Gotoshop::Thumbnail
add HexdigestNamedVersion
add thumbnail version to ShopLogoUploader
add CreateLogoThumbnailWorker