list activities
Merge remote-tracking branch 'origin/master'

Conflicts:
	hythloday-front/app/index.html
	hythloday-front/app/styles/main.css
	hythloday-front/app/styles/timeline.css