Action Button Changes
Merge branch 'master' of https://github.com/anish0705/TestApp

Conflicts:
	mobile/src/main/java/com/example/anishagarwal/testapp/MyActivity.java
	mobile/src/main/res/values/strings.xml
	wear/src/main/res/layout/rect_activity_my.xml