Merge branch 'master' of https://github.com/NaOHman/KitchenSync into UI_Testing_Jeffrey

Conflicts:
	.idea/workspace.xml
	res/layout/list_group.xml
attempting merger
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	res/layout/list_group.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml