changed scroll to animate
Merge branch 'master' into server

Conflicts:
	src/coffee/home/directives/cascadestream.coffee