Updated paths to reflect new location of \linux relative to root
Merge branch 'upstream-master' into debianimage-update

Conflicts:
	src/lib/DashboardEngine.js