Add username to the about page
CLOSED - task 348: Add username (as read only) to the settings page
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/348
CLOSED - task 353: How to show what data remains to be uploaded
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/353
OPEN - task 356: Manually submit trackers
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/356
OPEN - task 356: Manually submit trackers
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/356
CLOSED - task 356: Manually submit trackers
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/356
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml