finish migration
Migration finish #2
Merge branch 'Migration-Finish' of https://github.com/spatzschke/padcon-leipzig

Conflicts:
	app/Controller/CartsController.php
	app/Controller/CustomersController.php
	app/Controller/PagesController.php
	app/Controller/ProductsController.php
	app/Controller/SiteContentsController.php
	app/Vendor/tcpdf/examples/images/tux.svg
	app/Vendor/tcpdf/fonts/ae_fonts_2.0/COPYING
	app/Vendor/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
	app/Vendor/tcpdf/tcpdf_barcodes_1d.php
	app/View/Catalogs/view.ctp
	app/View/Elements/backend/miniCart.ctp
	app/View/Elements/backend/navigation.ctp
	app/View/Elements/backend/portlets/customerPortlet.ctp
	app/View/Elements/backend/portlets/offerInfoPortlet.ctp
	app/View/Elements/backend/portlets/productPortlet.ctp
	app/View/Elements/backend/portlets/userDetailPortlet.ctp
	app/View/Elements/backend/portlets/userPortlet.ctp
	app/View/Elements/footer.ctp
	app/View/Elements/partnerItem.ctp
	app/View/Elements/productItemColorSlider.ctp
	app/View/Layouts/admin.ctp
	app/View/Layouts/default.ctp
	app/View/Layouts/flash.ctp
	app/View/Offers/admin_index.ctp
	app/View/Products/listing.ctp
	app/View/Products/search.ctp
	lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
Create new Branch 'Development'
Remove Config
Add Config