Delete core.php
Merge branch 'testing' into dev
Merge branch 'master' into dev