CLOSED - task 369: Change default activity background to be white
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/369
CLOSED - task 373: Registration returns 'error connecting' first time
the form is submitted
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/373
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/values/resources.xml