Improving form layout
Improving index layout
Adjusting edit view
Merge branch 'master' into layout

Conflicts:
	app/views/pages/_form.html.haml
	app/views/pages/index.html.haml
Merge pull request #1 from alinecaton/layout

Layout