Added Facebook login for registration and login
Merge branch 'FacebookLogin'
Merge branch 'master' of https://github.com/kachi1227/gjk

Conflicts:
	Chassip/src/main/java/com/gjk/ConvoFragment.java
	Chassip/src/main/java/com/gjk/MainActivity.java
Fixing merge issues