Another UI iteration.
Merge branch 'master' of github.com:substance/composer

Conflicts:
	src/views/composer.js