Working on settings page
Merge remote-tracking branch 'origin/master'

Conflicts:
	ro-backend/apps/public/urls.py
	ro-backend/apps/public/views.py
Added comma