Merge branch 'master' of github.com:radek-baczynski/ActiveEntity