Design Compatibility
Merge branch 'master' of https://github.com/hughesrl/icare

Conflicts:
	app/src/main/res/layout/activity_menu.xml