Fixed chaning status
active admin
Before merge with FixMErails
merge develop
merge develop
merge develop
fix spec
fix spec
Uploading backgrounds via Carrierwave
Background uploads path fixed
Fixed conflicts after merge with validates
background admin
background admin
js fix
sprite and span smile
Merge branch 'back_uploads' into develop

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/javascripts/github_registrations.js.coffee
	app/assets/javascripts/messages.js
	app/assets/javascripts/pusher.js
	app/assets/stylesheets/application.css.scss
	app/controllers/application_controller.rb
	app/controllers/friendships_controller.rb
	app/controllers/message_controller.rb
	app/controllers/rooms_users_controller.rb
	app/controllers/users_controller.rb
	app/models/friendship.rb
	app/models/message.rb
	app/models/user.rb
	app/views/layouts/application.html.haml
	config/initializers/devise.rb
	config/initializers/omniauth.rb
	config/routes.rb
	spec/controllers/rooms_users_controller_spec.rb
	spec/controllers/users_controller_spec.rb
	spec/factories/rooms_users.rb
	spec/factories/users.rb
	spec/mailers/user_mailer_spec.rb
	spec/models/status_spec.rb
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/emoji.css.scss