removed conflicks?
Merge branch 'dragonfly'

Conflicts:
	.idea/workspace.xml
	app/views/layouts/application.html.haml