merging in latest rzmvc framework (autoloader)