Upgrade from montuy337513 (alias black_beard)
Adding /themes/xbootstrap/modules with renamed ...
replaced "dirname(__FILE__)" with "__DIR__"
reverting couple of $i++ conversions
converting $i++ to ++$i for improved performance
fixing a bug (wrong name of Criteria)
Updating some changes from Luciorota
Clean-up of assets, PSR-2, __DIR__, English upd...