Messy cleanup
Merge branch 'master' of https://github.com/Rokford/PowerfulShoppingList

Conflicts:
	.gitignore
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/PowerfulShoppingList/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PowerfulShoppingList/.indexes/e4/81/96/5e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PowerfulShoppingList/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/PowerfulShoppingList/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/368001718.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml