Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/devise/sessions/new.html.haml
	app/views/devise/shared/_links.haml
Merge branch 'style'

Conflicts:
	app/views/devise/sessions/new.html.haml
	app/views/devise/shared/_links.haml
:car: Comments are implemented with some tests