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

Conflicts:
	README.md