Fixing Live Feed URL

Instructor view
"Live Feed" URL was corrected
Revert "Fixing Live Feed URL"

This reverts commit 4468afd8eccf267ac075a2286fc6c85740cf894c.
Revert "Revert "Fixing Live Feed URL""

This reverts commit f41dc060690729dafb3be916430559443d0685a3.
Undo Revert/ Fixing Live feed URL
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/Event.java