Full planning integration into master

Knowledgebase phase of project is complete!
When calling a static method, put the classname in front (i.e. IngredientFactory.setAttributes)