substantial layout rework
Merge branch 'controller' of github.com:psev/mink.io into controller

Conflicts:
	lib/document.coffee.md
	lib/model.coffee.md