Implements display of teacher notes in activity view
added favicon
Merge branch 'feature/80-teacher-specific-notes-for-activities' of https://github.com/lighthouse-labs/laser_shark into feature/80-teacher-specific-notes-for-activities
fixed hardcoded admin password
Merge pull request #41 from lighthouse-labs/bug-fix/admin-password-env

fixed hardcoded admin password
Merge branch 'master' into feature/previous-next-activity-details

Conflicts:
	app/views/activities/show.html.slim