Merge pull request #154 from InsomniaNY/3.0

Reseller Registration and Login Fixes