fix layout
Merge commit 'a9a3188bdcce26ab78eb353469eb2649b55fdaa6' into layout

Conflicts:
	app/views/layouts/application.html.haml
add 'erd' gem
Merge branch 'master' into layout
mod questions
Merge commit '923f693c134305ef42ca959a1aed8531984d076c' into layout