removed call to deprecated methods. save and get data from db
Merge remote-tracking branch 'origin/master'