upped version number, storing name in db
Merge remote-tracking branch 'origin/master'