News feed changes
Merge branch 'master' of github.com:rutvijkumarshah/WatsiAndroidApp

Conflicts:
	res/values/strings.xml
	src/codepath/watsiapp/WatsiApplication.java