interface changes before big merge
Merge branch 'master' of github.com:joinOpenHack/Spotly