updates
removed old files
bug fix and auto migration
Merge remote-tracking branch 'origin/master'