ui for bottle done
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop