merge
merge
Merge branch 'master' of
ssh://git@github.com/gregorybesson/playground.git

Conflicts:
	design/admin/default/base/adfab-core/dashboard/index.phtml
	design/admin/default/base/adfab-core/elfinder/ckeditor.phtml
	design/admin/default/base/adfab-core/elfinder/index.phtml
	design/admin/default/base/adfab-core/formgen/checkbox.phtml
	design/admin/default/base/adfab-core/formgen/create.phtml
	design/admin/default/base/adfab-core/formgen/creditcard.phtml
	design/admin/default/base/adfab-core/formgen/date.phtml
	design/admin/default/base/adfab-core/formgen/dropdown.phtml
	design/admin/default/base/adfab-core/formgen/email.phtml
	design/admin/default/base/adfab-core/formgen/hidden.phtml
	design/admin/default/base/adfab-core/formgen/index.phtml
	design/admin/default/base/adfab-core/formgen/input.phtml
	design/admin/default/base/adfab-core/formgen/number.phtml
	design/admin/default/base/adfab-core/formgen/paragraph.phtml
	design/admin/default/base/adfab-core/formgen/password.phtml
	design/admin/default/base/adfab-core/formgen/passwordverify.phtml
	design/admin/default/base/adfab-core/formgen/phone.phtml
	design/admin/default/base/adfab-core/formgen/radio.phtml
	design/admin/default/base/adfab-core/formgen/test.phtml
	design/admin/default/base/adfab-core/formgen/upload.phtml
	design/admin/default/base/adfab-core/formgen/url.phtml
	design/admin/default/base/adfab-core/formgen/view.phtml
	design/admin/default/base/adfab-core/layout/form-menu.phtml
	design/admin/default/base/adfab-core/system/index.phtml
	design/admin/default/base/adfab-core/system/modules.phtml
	design/admin/default/base/adfab-core/system/settings.phtml
	design/admin/default/base/adfab-user/create.phtml
	design/admin/default/base/adfab-user/edit.phtml
	design/admin/default/base/adfab-user/email/newemail.phtml
	design/admin/default/base/adfab-user/list.phtml
	design/admin/default/base/adfab-user/pagination_userlist.phtml
	design/admin/default/base/adfab-user/user.phtml
	design/frontend/default/base/adfab-game/layout/col-lottery.phtml
	design/frontend/default/base/adfab-game/layout/col-quiz.phtml
	design/frontend/default/base/adfab-reward/index/pagination.phtml
	design/frontend/default/base/adfab-user/account/newsletter.phtml
	design/frontend/default/base/adfab-user/account/profile.phtml
	design/frontend/default/base/adfab-user/email/forgot.phtml
	design/frontend/default/base/adfab-user/email/verification.phtml
	design/frontend/default/base/adfab-user/forgot/forgot.phtml
	design/frontend/default/base/adfab-user/forgot/passwordchanged.phtml
	design/frontend/default/base/adfab-user/forgot/reset.phtml
	design/frontend/default/base/adfab-user/forgot/sent.phtml
	design/frontend/default/base/adfab-user/header/login.phtml
	design/frontend/default/base/adfab-user/layout/col-user.phtml
	design/frontend/default/base/adfab-user/partial/address.phtml
	design/frontend/default/base/adfab-user/register/fbregister.phtml
	design/frontend/default/base/adfab-user/register/login.phtml
	design/frontend/default/base/adfab-user/user/register.phtml
	design/frontend/default/base/adfab-user/user/registermail.phtml
	design/frontend/default/base/zfc-user/user/login.phtml