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.
commiting servercontroller.
Merge branch 'master' of
https://github.com/ashafir20/socialang-android.git

Conflicts:
	SocialClient/src/com/lang/social/controllers/ServerController.java
servercontroller update.