new UI changes
Merging chris's changes into pratik working dir.

Merge branch 'master' of https://github.com/cmnzs/wearability-android