Distorted lines in `diff`

Distorted lines in `diff` when viewing files `windows-style-line-separator: \r\n`
Description to groups added
Description added to temas
Spinach tests fixed
Description added to user temas factory
Table description indentation fixed
Desctiptions removed from dashboard
Tests for team and group descriptions added
Missing descriptions added
Css classes improved
Fixed notes from randx
use grit_ext 0.6.2
Merge pull request #3082 from devote/patch-1

Distorted lines in `diff`
Gem updated: devise, grape, sidekiq, settingslogic
updated gems: haml-rails, carrierwave
gems updated: unicorn, draper, github-markup
fix decorate calls on collections after draper update
use simple decorate on single commits
draper raise now RuntimeError instead of NoMethodError
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions

Conflicts:
	db/schema.rb