SQL for friends working, removing option and update option still pending
Merge branch 'sql-for-friends'

Conflicts:
	Code/ShoppingList/AndroidManifest.xml
	Code/ShoppingList/res/values/strings.xml