add save update methods
add save update method
add changes to DAO
Merge remote-tracking branch 'origin/master'