Merging with Will's changes. Commit before fetching.
Merge branch 'master' of https://www.github.com/wpferg/scratch-app
Added chunk loading for dashboard friends.
Merge commit 'e9dd'

Conflicts:
	app/js/controllers.js
	app/js/directives.js