preview track
Merge branch 'design'

Conflicts:
	src/partials/main/main.html
	src/partials/main/mainCtrl.js