deleted icons
Resturant profile file changed
conflict fixed
changed in the profile.xml and restaurantprofile.java class
change in merge list.xml