salary module completed
final controller and model changes
merge resolved: