sms pwd changed
Merge branch 'master' of github.com:styletag/spree_affiliate
Merge pull request #7 from styletag/master

merge master to 1-3 stable