facebook
add last attributes to user model from auth hash
images
Merge branch 'feature/bestbuy' into dev
error fix
Merge remote-tracking branch 'origin/feature/completeModels' into dev
Merge remote-tracking branch 'origin/dev' into feature/frontstuff
Merge remote-tracking branch 'origin/feature/frontstuff' into dev
apis
stuff
j
categores
show page
Merge remote-tracking branch 'origin/feature/frontstuff' into dev
Merge remote-tracking branch 'origin/dev' into feature/bestbuy

Conflicts:
	app/views/stores/index.html.erb
	app/views/users/index.html.erb