integrated conversation screen
integrated new user profile page
stuff
Merge branch 'rails4' of https://github.com/mayank2707/date into mayank2707-rails4

Conflicts:
	Gemfile
	app/views/users/index.html.slim