user_id before session created bug on index
Merge branch 'development'

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_header.html.erb