Admin improvements
Merge branch 'master' of github.com:upptalk/uppsell
Fix merge conflicts