start using the new api v2 for amahi 7. misc cleanup
Merge branch 'master' of github.com:amahi/platform