Bugfix, migrate.php.sample renamed in migrate.php
Merge branch 'rel/chiba2' of https://github.com/novius-os/novius-os into rel/chiba2