Modified conversation controler #9
Resolve conflicts + Conversation Controller and Conversation Views modified #9
Added new_conversation/:id #11
Added listing for all your conversations/Create a conversation on new_conversation/:id #9
Added listing of all messages in a conversation (\conversations\:id) #9
Merge branch 'master' into 9-bitca-andrei

Conflicts:
	Online Tests/app/assets/stylesheets/custom.css.scss
	Online Tests/config/routes.rb
	Online Tests/config/routes.rb~
	Online Tests/db/schema.rb
Merge branch 'master' into 9-bitca-andrei

Conflicts:
	Online Tests/db/schema.rb
Merge pull request #24 from bitca-andrei/9-bitca-andrei

9-bitca-andrei : Private message system finished