before merge. added gridview.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SocialClient/src/com/lang/social/activities/LoginActivity.java
	SocialClient/src/com/lang/social/activities/RegisterActivity.java
	SocialClient/src/com/lang/social/controllers/ServerController.java
	SocialClient/src/com/lang/social/fragments/FacebookFragment.java
	SocialClient/src/com/lang/social/interfaces/LoginListener.java
	SocialClient/src/com/lang/social/iocallback/IOCallBackHandler.java
updated homeActivity screen.
Updated Controller.
commiting servercontroller.
Merge branch 'master' of
https://github.com/ashafir20/socialang-android.git

Conflicts:
	SocialClient/src/com/lang/social/controllers/ServerController.java
servercontroller update.
fixed facebook login.
updated homeActvity.
updated facebook fragment.
updated facebookFragment ver2.
added selfLearn Menu List.
added progressDialog to loginActivity.
updated GamesListActivity.
updated drawer.
updated drawerlayout.
fixed roomActivity and started creating competition activity.
updated CompetitionActivity And Fragment.
updated competitionActivity and fragments.
updated languageDialogFragment.
fixed spinner.