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

# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb

app/controllers/application_controller.rb

@@ -3,16 +3,17 @@ class ApplicationController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
-  helper_method :current_company,:current_login_employee
-
+  helper_method :current_company,:current_login_employee,:current_user
+   # alias_method :current_user, :current_login_employee,:current_user
   #this is base api base controller to need to inherit.
   #all token authentication must be done here
   #response format must be set to JSON
 
-  # rescue_from CanCan::AccessDenied do |exception|
-  #   flash[:warning] = exception.message
-  #   redirect_to root_path
-  # end
+
+  rescue_from CanCan::AccessDenied do |exception|
+    flash[:warning] = exception.message
+    redirect_to root_path
+  end
 
 
   def current_user