Merge branch 'ma'
Fixed navigation pane
Some navigation and sign in UI fixes
Merge branch 'ma'

Conflicts:
	app/views/devise/registrations/new.html.erb
Merge branch 'master' of https://github.com/mikhail-aksenov/barnyard