refactor code for constract_controller for create and update
list all contracts that is not null
Merge pull request #1 from Originate/salary_activity

Salary activity
init rspec. Create factories for employee. Create Sameer for system_admin
commit the Gemfile and .rspec file
Merge pull request #2 from Originate/init_rspec

Init rspec
remove the test/ folder
Merge branch 'master' of github.com:Originate/oc-hr-tracker
add scaffold salary_activity. Remove links from contracts_index page for common employees
working on SalaryActivityController#create. Bug in redirect_to method
fix bugs on create action. Notice about the pathw
fix bugs about salary_activities. Don not use scaffold again !!
the current_salary should not be nil or 0
Merge pull request #3 from Originate/salary_activity

Salary activity
add discussion model and controller
can create or update a discussion for salary activity. Notice: the new method for slary_activity is just creating a new one
make the discussion form in the salary_activity. Construct it in create action
make the discussion form individule. make the radio button better
Merge pull request #4 from Originate/ajax_discussion_note

Ajax discussion note
add bonus model