scaffold content
add dragonfly
fix schema.rb
Merge branch 'feature/contents'

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'master' of github.com:blp1526/konjaku