added logo
Merge branch 'master' into development
login style
Merge remote-tracking branch 'origin/development'

Conflicts:
	app/views/devise/registrations/new.html.erb