Mock shopping list browser added
Resolved conflicts
Fixed string and manifest warnings