Add message sound
Add-status
fix js
add notification
fix parse youtube
Merge branch 'Add_notification' into develop
Merge branch 'Add-status' into develop

Conflicts:
	README.md
	app/assets/javascripts/messages.js
	app/assets/javascripts/rooms.js
	app/assets/stylesheets/chat.css
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/assets/stylesheets/messages.css
	app/controllers/application_controller.rb
	app/controllers/message_controller.rb
	app/controllers/rooms_controller.rb
	app/controllers/rooms_users_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/models/rooms_user.rb
	app/models/user.rb
	app/views/layouts/_inet.html.haml
	app/views/layouts/_messages.html.haml
	app/views/layouts/application.html.haml
	app/views/message/_room_users.html.haml
	app/views/message/show.html.haml
	app/views/rooms/_form.html.haml
	app/views/rooms/new.html.haml
	app/views/rooms/show.html.haml
	app/views/users/index.html.haml
	config/routes.rb
	db/migrate/20140314150603_add_login_to_user.rb
	db/schema.rb
	spec/factories/users.rb
	spec/models/user_spec.rb
add inviteable
'develop' into add_avatar

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/chat.css
	app/controllers/message_controller.rb
	app/helpers/application_helper.rb
	app/models/user.rb
	app/views/message/show.html.haml
	app/views/users/index.html.haml
	db/schema.rb
	spec/factories/users.rb
	spec/models/user_spec.rb