no message
Merge branch 'master' of https://github.com/saiffac/ffac
added new design
Merge branch 'master' of https://github.com/saiffac/ffac

Conflicts:
	apparelstore/.gitignore
	apparelstore/gensrc/de/hybris/platform/apparelstore/constants/GeneratedApparelstoreConstants.java
	apparelstore/gensrc/de/hybris/platform/apparelstore/jalo/GeneratedApparelstoreManager.java
	ffaccockpits/.gitignore
	ffaccockpits/gensrc/com/sai/ffac/cockpits/constants/GeneratedFfacCockpitsConstants.java
	ffaccore/.gitignore
	ffaccore/classes/com/sai/ffac/core/constants/GeneratedFfacCoreConstants$Enumerations$SwatchColorEnum.class
	ffaccore/gensrc/com/sai/ffac/core/constants/GeneratedFfacCoreConstants.java
	ffaccore/gensrc/com/sai/ffac/core/jalo/GeneratedApparelProduct.java
	ffaccore/gensrc/com/sai/ffac/core/jalo/GeneratedApparelSizeVariantProduct.java
	ffaccore/gensrc/com/sai/ffac/core/jalo/GeneratedApparelStyleVariantProduct.java
	ffaccore/gensrc/com/sai/ffac/core/jalo/GeneratedElectronicsColorVariantProduct.java
	ffaccore/gensrc/com/sai/ffac/core/jalo/GeneratedFfacCoreManager.java
	ffaccore/hmc/bin/ffaccorehmc.jar
	ffacfacades/gensrc/com/sai/ffac/facades/constants/GeneratedFfacFacadesConstants.java
	ffacfulfilmentprocess/.gitignore
	ffacfulfilmentprocess/gensrc/com/sai/ffac/fulfilmentprocess/constants/GeneratedFfacFulfilmentProcessConstants.java
	ffacfulfilmentprocess/gensrc/com/sai/ffac/fulfilmentprocess/jalo/GeneratedFfacFulfilmentProcessManager.java
	ffacinitialdata/.gitignore
	ffacinitialdata/gensrc/com/sai/ffac/initialdata/constants/GeneratedFfacInitialDataConstants.java
	ffacstorefront/.gitignore
	ffacstorefront/web/addonsrc/saiffaccheckoutaddon/com/sai/ffac/addon/paypalcheckoutaddon/controllers/pages/SaiFfacCheckoutStepController.java
	ffacstorefront/web/webroot/WEB-INF/tags/desktop/common/header/header.tag
	ffacstorefront/web/webroot/WEB-INF/tags/desktop/nav/topNavigation.tag
	ffacstorefront/web/webroot/WEB-INF/tags/desktop/template/page.tag
	ffacstorefront/web/webroot/WEB-INF/views/addons/saiffaccheckoutaddon/desktop/pages/checkout/multi/saiFfacSummaryPage.jsp
	ffacstorefront/web/webroot/WEB-INF/views/desktop/cms/footercomponent.jsp
	saiffaccheckoutaddon/gensrc/com/sai/ffac/addon/paypalcheckoutaddon/constants/GeneratedSaiffaccheckoutaddonConstants.java
	saiffaccheckoutaddon/gensrc/com/sai/ffac/addon/paypalcheckoutaddon/jalo/GeneratedSaiffaccheckoutaddonManager.java
	saiffaccheckoutaddon/hmc/bin/saiffaccheckoutaddonhmc.jar
	saiffaccheckoutaddon/platformhome.properties
Merge branch 'master' of https://github.com/saiffac/ffac

Conflicts:
	ffacstorefront/web/webroot/_ui/desktop/ffac/css/changes.css
	ffacstorefront/web/webroot/_ui/desktop/ffac/css/style.css