started #404
fixes #405
Merge branch 'issue#404' into merge_branch
Merge branch 'issue#405' into merge_branch

Conflicts:
	src/Catty/DataModel/Formula/Formula.h
	src/Catty/DataModel/Formula/Formula.m
	src/Catty/DataModel/Formula/FormulaElement.h
	src/Catty/DataModel/Formula/FormulaElement.m
	src/Catty/DataModel/Header/Header.h
	src/Catty/DataModel/Header/Header.m
	src/Catty/DataModel/SpriteObject/SpriteObject.m
	src/Catty/Defines/ActionSheetAlertViewTags.h
	src/Catty/Defines/ProgramDefines.h
	src/Catty/Helpers/Util/Util.h
	src/Catty/Helpers/Util/Util.m
	src/Catty/Parser/NEW/CBXMLParser.m
	src/Catty/Parser/NEW/Helper/CBXMLParserHelper.m
	src/Catty/Parser/NEW/XMLHandler/Header/Header+CBXMLHandler.m
	src/Catty/Parser/NEW/XMLHandler/Look/Look+CBXMLHandler.h
	src/Catty/ViewController/BaseViewController/BaseWebViewController.m

src/Catty/ViewController/Continue&New/MaintainObject/MaintainScript/Bric
kDetailViewController.m

src/Catty/ViewController/Continue&New/MaintainObject/MaintainScript/Scri
ptCollectionViewController.m
	src/Catty/ViewController/Download/FeaturedProgramsStoreViewController.m
	src/Catty/Views/Custom/CollectionViewCells/BrickCell.m
	src/CattyTests/XMLParserAbstractTest.h
	src/CattyTests/XMLParserAbstractTest.m
	src/CattyTests/XMLParserHeaderTests.m