Merge pull request #47 from daniellemayne/2013.07

bugzid 3451: fixed flavorRef parsing and max storage size - 2013.07