Pull from master

config/initializers/action_controller.rb

@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      #check for license file
+      check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
       else

db/migrate/20170403155230_create_employees.rb

@@ -3,6 +3,7 @@ class CreateEmployees < ActiveRecord::Migration[5.1]
     create_table :employees do |t|
       t.string :name, :null => false
       t.string :role, :null => false, :default => "cashier"
+      t.boolean :is_active, :default => true
       t.string :emp_id, :null => false
       t.string :password_digest, :null => false
       t.string :token_session