agregado profile pic
added bestinplace
added best_in_place 3
added best_in_place 4
Removed .orig files from merge
Restore db config and gems
Fixed js and css inclusion
Merge remote-tracking branch 'origin/reysol'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/yeti.html.erb
	db/schema.rb