Weird Merging Occurring

May have to revert.
Removing something Erroneous
Correcting Merge Strangeness
Add new Lists for data read Import

List boxAssignment.  Place holding List linkedRecipe.  Removed diff and
resorted a few lines.
Added Box Ids to Recipes in Master_recipe_data

Appended title:author line to include all Unique box ids the specific
recipe belongs to.  New format - title:author:boxid[0]:....:boxid[j]
Merge remote-tracking branch 'origin/master' into T-Reader
It doesn't like it

Error in an XML file: aborting build.
Revert "It doesn't like it"

This reverts commit b828f20f09c6f135b50a78f977e2995ed22c6ae5.
Solved XML Error

Able to update descriptions properly now.
Updated Box Descriptions

Added into the XML directly - Adding the descriptions in the Eclipse
Resources menu rather than the XML directly adds unnecessary extra code.
Merge branch 'master' into Facebook