Bugfix: Instead of resource there was an undefined property
Merge pull request #94 from taai/3.3/develop

Bugfix: Instead of resource there was an undefined property
Create composer.json based on the oone in Kohana's ORM module
Merge pull request #98 from kohenkatz/3.3/develop

Create composer.json based on the oone in Kohana's ORM module
Merge branch 'refs/heads/3.3/develop' into 3.3/master