pulling from master
Merge branch 'master' of github.com:Shadae/Scamazon
fix migration problems hopefully