Fixed date format issue, changed type of salary attr from DecimalFormat to double
Merge branch 'finalera' of https://github.com/gilvanritter/Javanes into finalera

Merge updates