Merge branch 'master' of https://github.com/ribardb/framework_java