merge changes
Merge branch 'whitelabel' of github.com:moliver777/RycroftSM into whitelabel