Added User sign in/up on layout.html.erb
Merge branch 'Users' into development
Fixed merge conflicts