Stuff on goal page
Merge branch 'goalsPage'

Conflicts:
	ro-backend/apps/public/views.py
	ro-frontend/public/index.html