Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/controllers/home_controller.rb

@@ -20,6 +20,7 @@ class HomeController < ApplicationController
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
     @employees = Employee.all.where("is_active = true").order("name asc")
+    @roles = Lookup.collection_of("employee_roles")
     @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end