Remove reseller
Change image stuff
Merge branch 'master' into develop