Starting Custom Nav Drawer.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SocialClient/AndroidManifest.xml
	SocialClient/res/values/strings.xml
	SocialClient/src/com/lang/social/controllers/ServerController.java