Fix Link Changes
Merge branch 'rails323'

Conflicts:
	app/views/profile/index.rhtml
add oracle stuff
call authorize as a before_filter
Refactor Form Email
no need to set that value inside the mailer
use sendmail for email
just say no to oracle
don't forget Gemfile.lock
Fix and refactor addiional_salary_form
Refactor add_salary_form and layout after form_submit
Refactor add_salary form.
Refactor acos_form.
Refactor join_staff_form
Clean Codes
Fix conflicts
Add pagination to the directory
Minor Fixes
Fix paging display
change common_engine repo location