Changes made by Said Yakubov (xdsemx@gmail.com).
Merge branch 'master' of https://github.com/grandison/social_up_android.git

Conflicts:
	babarka/index.html