#2 implement devise for use login.
#3-webapp-login-via-facebook
add config keys of FB to YML
#4 functionality to upload profile pic.
5- divide modules seperately for web,  api and Admin.

Signed-off-by: Manish Johari <manish.johari@kiwitech.com>
6- functionality to confirm email via signup process via email.
6 - skip confirmation through email during signup via facebook.
#7 After sign up on first visit send user to edit profile page.
Merge branch '7-webapp-after-signup-on-first-visit-send-user-to-edit-profile-page' into integration
#8 Api implementaion
#9 functionality to deactivate account.
#9 api for deactivating a user.

Signed-off-by: Manish Johari <manish.johari@kiwitech.com>
#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
remove application.yml
Merge branch '8-webapp-api-for-user-signin-signout-password-send-and-change-password' into integration

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
Merge branch '9-webapp-functionality-to-deactivate-account' into integration