UI button design
UI button design icons
Merge remote-tracking branch 'origin/master'

Conflicts:
	wear/src/main/res/layout/round_activity_my_activity_watch.xml