Merge branch 'develop' into feature-admin_users

Conflicts:
	users/app/controllers/application_controller.rb
	users/app/models/user.rb

2 files changed, 9 insertions, 6 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 693bd86..be7aa1f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,5 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  helper_method :current_user
-
-  private
-  def current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
-  end
+  ActiveSupport.run_load_hooks(:application_controller, self)
 end
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 0be7ca2..9e68674 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,3 +1,11 @@
 
 Try to fetch a 
 = link_to "cert", cert_path
+
+%p 
+Try to create a 
+= link_to "ticket", new_ticket_path
+
+%p
+See all 
+= link_to "tickets", tickets_path