Update composer.json
fix test to include by hand.
Merge branch 'master' of github.com:Surt/Granada
Update bootstrap.php
Fix: find_one, find_many models contains Wrapper ORM and not ORM
Merge branch 'master' of github.com:Surt/Granada
Fix setter for relationships
new instances of ORMWrapper must define _class_name for model
Some new tests and assertions
Fix pluck
Add filter return 'ormwrapper' when no filter is defined
Adding the use of dot notation for eager loading.
Example: with('posts.comments')
new tests added
whitelist on phpunit.xml to show codecoverage of src only
show aditions on 1.5.2
show aditions on 1.5.2
Fixed __callStatic to refer to self
Merge branch 'master' of github.com:Surt/Granada

Conflicts:
	README.markdown
Update README.markdown
Update .travis.yml
Update .travis.yml
Update .travis.yml