Fixed files
Merge branch 'user'

Conflicts:
	app/views/layout.erb