Changes menu - 2
Merge branch 'master' of https://github.com/elf11/ShareNCare

Conflicts:
	.idea/workspace.xml