Merge from develop. Working version with Autoloader, namespacing and examples in index.php