Extended CPIngredient class to parse Cookipedia data
Merge branch 'master' of https://github.com/lamara/recipeapp

Conflicts:
	recipe/recipe.iml