CLOSED - task 331: Add parameter to specify how many courses are on the
phone before the download courses button disappears 
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/331
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/org/digitalcampus/oppia/fragments/ResetFragment.java