Merge branch 'master' of github.com:lolmvc/framework