Merge remote-tracking branch 'upstream/develop'

[*]: fix phpdoc for extended classes

Merge pull request j4mie#310 from j4mie/develop

Merge develop into master for release

Merge pull request #5 from rvilbrandt/Hotfix-BuildOrderBy

Fix _build_order_by() using real connection instead of default

[+]: use "assertSame" instead of "assertEquals"

[+]: "Add asJson() to ORM and ResultSet"

-> Thx @kitchenu -> kitchenu@8ba8b5e

[~]: small refactoring ...

[+]: fixed ORM::__callStatic()

[+]: use type-casting for limit and offset

Merge branch 'master' of https://github.com/voku/idiorm

* 'master' of https://github.com/voku/idiorm:
  Update README.markdown
  Update README.markdown
  Update README.markdown