Merge guis_for_chrissy into itemListFragment_and_addItemActivity
-Fixed bug in ContentProvider