layout
asdf
Merge branch 'master' of https://github.com/ssoima/smartprezI

Conflicts:
	.idea/.name
	.idea/misc.xml
	.idea/modules.xml
	mobile/mobile.iml
	wear/wear.iml
dg