Merge remote-tracking branch 'origin/dev-nd'
Merge branch 'dev-ma'
Merge pull request #1 from mikhail-aksenov/dev-nd

Dev nd
Merge branch 'master' of https://github.com/mikhail-aksenov/barnyard
Fixed couple of critical typos
Merge branch 'dev-ma'
Devise hooks added
Stashing changes
A bit changes to application layout
Fixed devise issues
Helpers refactoring
Tickets stuff added.
Merge branch 'ma'

Conflicts:
	app/views/devise/registrations/new.html.erb
Tickets index changes
Hoverable ticket's index
Fixed tickets index markup
More fixes to the tickets
Stashing changes
Merge branch 'ma'
Merge pull request #2 from mikhail-aksenov/ma

Ma