added chathead and videoview
merged files
Merge branch 'master' of https://github.com/GreenRobots/JPHacks into feature/add-wear-heart-rate-view

Conflicts:
	mobile/src/main/java/im/ene/androooid/jphacks/MainActivity.java