Merge branch 'develop' of github.com:yanhick/Cocktail into develop

Conflicts:
	demo/market/bin/WebApp.js
	demo/market/bin/WebApp_js.html
	demo/market/bin/default.css
	demo/market/bin/native_apps/WebApp_BlackBerry_PhoneGap.jad
	demo/market/bin/native_apps/WebApp_iOS_PhoneGap_OTA_install.html
	demo/market/bin/native_apps/WebApp_iOS_PhoneGap_direct_OTA_install.html
	demo/market/build/WebApp_js.hxml
	demo/market/build/WebApp_js.hxproj
	demo/market/build/native_apps/WebApp_PhoneGapBuild_Dev/default.css
	demo/market/readme.txt
	demo/market/src/org/intermedia/controller/ApplicationController.hx
	demo/market/src/org/intermedia/model/ApplicationModel.hx
	demo/market/src/org/intermedia/model/CellDetailsRss.hx
	demo/market/src/org/intermedia/model/DataLoader.hx
	demo/market/src/org/intermedia/model/ThumbTextListRss.hx
	demo/market/src/org/intermedia/model/XmlLoader.hx
	demo/market/src/org/intermedia/view/CellBase.hx
	demo/market/src/org/intermedia/view/CellStyle.hx
	demo/market/src/org/intermedia/view/CellText.hx
	demo/market/src/org/intermedia/view/CellTextStyle.hx
	demo/market/src/org/intermedia/view/CellThumb.hx
	demo/market/src/org/intermedia/view/CellThumbStyle.hx
	demo/market/src/org/intermedia/view/CellThumbStyle2.hx
	demo/market/src/org/intermedia/view/CellThumbText1.hx
	demo/market/src/org/intermedia/view/CellThumbText1Style.hx
	demo/market/src/org/intermedia/view/Constants.hx
	demo/market/src/org/intermedia/view/CroppedImage.hx
	demo/market/src/org/intermedia/view/DetailStyle.hx
	demo/market/src/org/intermedia/view/DetailView.hx
	demo/market/src/org/intermedia/view/HeaderStyle.hx
	demo/market/src/org/intermedia/view/HeaderView.hx
	demo/market/src/org/intermedia/view/HomePage.hx
	demo/market/src/org/intermedia/view/ListViewBase.hx
	demo/market/src/org/intermedia/view/ListViewText.hx
	demo/market/src/org/intermedia/view/MenuCellText.hx
	demo/market/src/org/intermedia/view/MenuCellTextStyle.hx
	demo/market/src/org/intermedia/view/MenuListViewStyle.hx
	demo/market/src/org/intermedia/view/MenuListViewText.hx
	demo/market/src/org/intermedia/view/Scroll2D.hx
	demo/market/src/org/intermedia/view/StyleModel.hx
	demo/market/src/org/intermedia/view/SwippableListView.hx
	demo/market/src/org/intermedia/view/SwippableListViewStyle.hx
	demo/market/src/org/intermedia/view/ThumbTextList1Bis.hx
	demo/market/src/org/intermedia/view/ViewBase.hx
	demo/market/src/org/intermedia/view/ViewBaseStyle.hx
	demo/market/src/org/intermedia/view/ViewManager.hx
	demo/market/src/org/intermedia/view/ViewManagerStyle.hx
Merge branch 'develop' of github.com:yanhick/Cocktail into develop

Conflicts:
	demo/market/bin/WebApp.js
	demo/market/bin/WebApp_js.html
	demo/market/bin/default.css
	demo/market/bin/native_apps/WebApp_BlackBerry_PhoneGap.jad
	demo/market/bin/native_apps/WebApp_iOS_PhoneGap_OTA_install.html
	demo/market/bin/native_apps/WebApp_iOS_PhoneGap_direct_OTA_install.html
	demo/market/build/WebApp_js.hxml
	demo/market/build/WebApp_js.hxproj
	demo/market/readme.txt
	demo/market/src/org/intermedia/controller/ApplicationController.hx
	demo/market/src/org/intermedia/model/ApplicationModel.hx
	demo/market/src/org/intermedia/model/CellDetailsRss.hx
	demo/market/src/org/intermedia/model/DataLoader.hx
	demo/market/src/org/intermedia/model/ThumbTextListRss.hx
	demo/market/src/org/intermedia/model/XmlLoader.hx
	demo/market/src/org/intermedia/view/CellBase.hx
	demo/market/src/org/intermedia/view/CellStyle.hx
	demo/market/src/org/intermedia/view/CellText.hx
	demo/market/src/org/intermedia/view/CellTextStyle.hx
	demo/market/src/org/intermedia/view/CellThumb.hx
	demo/market/src/org/intermedia/view/CellThumbStyle.hx
	demo/market/src/org/intermedia/view/CellThumbText1.hx
	demo/market/src/org/intermedia/view/CellThumbText1Style.hx
	demo/market/src/org/intermedia/view/Constants.hx
	demo/market/src/org/intermedia/view/CroppedImage.hx
	demo/market/src/org/intermedia/view/DetailStyle.hx
	demo/market/src/org/intermedia/view/DetailView.hx
	demo/market/src/org/intermedia/view/HeaderStyle.hx
	demo/market/src/org/intermedia/view/HeaderView.hx
	demo/market/src/org/intermedia/view/HomePage.hx
	demo/market/src/org/intermedia/view/ListViewBase.hx
	demo/market/src/org/intermedia/view/ListViewText.hx
	demo/market/src/org/intermedia/view/MenuCellText.hx
	demo/market/src/org/intermedia/view/MenuCellTextStyle.hx
	demo/market/src/org/intermedia/view/MenuListViewStyle.hx
	demo/market/src/org/intermedia/view/MenuListViewText.hx
	demo/market/src/org/intermedia/view/Scroll2D.hx
	demo/market/src/org/intermedia/view/StyleModel.hx
	demo/market/src/org/intermedia/view/SwippableListView.hx
	demo/market/src/org/intermedia/view/SwippableListViewStyle.hx
	demo/market/src/org/intermedia/view/ThumbTextList1Bis.hx
	demo/market/src/org/intermedia/view/ViewBase.hx
	demo/market/src/org/intermedia/view/ViewManager.hx
	demo/market/src/org/intermedia/view/ViewManagerStyle.hx
updated layout tests
updated market