Refactor sp_staff and sp_users relationship
Merge branch 'rails3' of github.com:thelabtech/common_engine into rails3