Add basic layout functionality to expeditions_controller and users_controller
Merge branch 'layouts'