data folder
readme
readme
Merge branch 'master' of https://github.com/PhpNinja/Php-Ninja-Backoffice

Conflicts:
	README.md
newsletter
update Order
bugs fixed
readme
config email default
update order bug
readme
readme
Merge branch 'master' of https://github.com/PhpNinja/Php-Ninja-Backoffice
install bug fix
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop