#19 added default salary
Merge branch 'development' into feature_#1

* development:
  #19 added default salary