fixed: smooth scroll and current section not working properly
Merge branch 'master' into demo

Conflicts:
	app/scripts/directives/scroll-directive.coffee