Api and admin refactor
Testing continued
Merge branch 'master' of https://github.com/arni1981/picasso