..b2c finally moved inside b2b
Merge branch 'master' into HEAD
fixed merge conflicts
Conflicts:
	public/brand/.htaccess
	public/brand/application/Bootstrap.php
	public/brand/application/configs/application.ini
	public/brand/application/controllers/AdminController.php
	public/brand/application/controllers/AdminController.php~
	public/brand/application/layouts/scripts/layout.phtml
	public/brand/application/layouts/scripts/layout.phtml~
	public/brand/application/layouts/scripts/layout_admin.phtml
	public/brand/application/views/scripts/admin/list.phtml
	public/brand/application/views/scripts/admin/news.phtml
	public/brand/application/views/scripts/admin/recipes.phtml
	public/brand/application/views/scripts/admin/recipes.phtml~
	public/brand/application/views/scripts/admin/slider.phtml
	public/brand/application/views/scripts/custom/pages.xml
	public/brand/application/views/scripts/custom/slider.xml
	public/brand/application/views/scripts/custom/slider.xml~
	public/brand/application/views/scripts/index/index.phtml
	public/brand/application/views/scripts/index/simplepage.phtml
	public/brand/css/style.css~
	public/brand/index.php
	public/brand/index.php~
	public/brand/public/index.php~
few fixes on data
..
.
few fixes on data

Conflicts:

	public/brand/application/views/scripts/custom/slider.xml
wtf w slider!!
i said wtf w slider.xml
get da f**ck out!
get da f**ck out!
Merge commit '0f1e08b'
data fix
..