#8 Api implementaion
#8 commit gemfile.lock
Merge branch '8-webapp-api-for-user-signin-signout-password-send-and-change-password' of github.com:manish-johari/gchat into 9-webapp-functionality-to-deactivate-account

Conflicts:
	app/views/web/settings/index.html.erb
	config/locales/en.yml
	config/routes.rb