Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/account_controller.rb

@@ -30,7 +30,7 @@ class AccountController < ApplicationController
         user = UserExtensions.where(:user_id => User.current.id).first
         if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil?
           redirect_to my_account_path(:tip => 1)
-        elsif user.identity == 3 && user.occupation.nil?
+        elsif user.identity == 3 && user.school_id.nil?
           redirect_to my_account_path(:tip => 1)
         else
           redirect_to user_path(User.current)
@@ -359,7 +359,7 @@ class AccountController < ApplicationController
        user = UserExtensions.where(:user_id => User.current.id).first
        if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil?
          redirect_to my_account_path(:tip => 1)
-       elsif user.identity == 3 && user.occupation.nil?
+       elsif user.identity == 3 && user.school_id.nil?
          redirect_to my_account_path(:tip => 1)
        else
          redirect_back_or_default User.current