create conversation by uploading file
fix scroll bug
Merge branch 'conversation_upload'

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/main.css.scss
	app/models/conversation.rb
	app/views/conversations/index.html.haml
add view of listing
Merge branch 'master' of github.com:redmintlabs/hackaton-bootstrap
Merge branch 'master' of github.com:redmintlabs/hackaton-bootstrap

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/main.css.scss
	app/views/conversations/index.html.haml
fix master
Merge branch 'master' of github.com:redmintlabs/hackaton-bootstrap