update paths
erge branch '1.8/develop' of https://github.com/liftme/fuel into 1.8/develop