delete conversation layout, conversation's template render with application layout
static container
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/conversations.html.haml