adding scroll
Merge branch 'origin/bnj'

Conflicts:
	www/js/controllers.js