OPEN - task 105: Add option to download activity logs to Excel/CSV 
https://github.com/DigitalCampus/django-oppia/issues/issue/105
OPEN - task 83: Look at adding profile photos 
https://github.com/DigitalCampus/django-oppia/issues/issue/83
OPEN - task 117: Complete ip2location script 
https://github.com/DigitalCampus/django-oppia/issues/issue/117
OPEN - task 117: Complete ip2location script 
https://github.com/DigitalCampus/django-oppia/issues/issue/117
OPEN - task 83: Add profile photos 
https://github.com/DigitalCampus/django-oppia/issues/issue/83
CLOSED - task 83: Add profile photos 
https://github.com/DigitalCampus/django-oppia/issues/issue/83
CLOSED - task 105: Add option to download activity logs to Excel/CSV 
https://github.com/DigitalCampus/django-oppia/issues/issue/105
CLOSED - task 207: Spilt scoring enabled into points/badges 
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/207
CLOSED - task 207: Spilt scoring enabled into points/badges 
https://github.com/DigitalCampus/oppia-mobile-android/issues/issue/207
CLOSED - task 90: Spilt scoring enabled into points/badges 
https://github.com/DigitalCampus/django-oppia/issues/issue/90
Fix date format returned in awards API
Limit no records returned by points API to 100
Merge remote-tracking branch 'upstream/master'

Conflicts:
	oppia/admin.py
	oppia/api/resources.py
	oppia/local_settings.py
	oppia/models.py
	oppia/profile/views.py