edit layout of CategoryItem
Merge branch 'master' of https://github.com/NohSeho/android_wear

Conflicts:
	Application/Application.iml
	Wearable/Wearable.iml