Changed 'return_value'  key to 'return_type' in README example
Merge pull request #27 from willhoit/typo/ability-options-example

Changed 'return_value'  key to 'return_type' in README example
Fix foreign key constraint issue when deleting a permission or role
Recover another bugfix from its original status since it's in another pull request already
Update EntrustRole.php
update
Merge branch 'master' of https://github.com/andyhu/entrust

Conflicts:
	src/Zizaco/Entrust/EntrustRole.php
table permission_role should be dropped first
Merge pull request #29 from andyhu/master

Fix foreign key constraint issue when deleting a permission or role
Merge branch 'master' of https://github.com/Zizaco/entrust

Conflicts:
	src/Zizaco/Entrust/EntrustRole.php
	src/Zizaco/Entrust/HasRole.php
	src/views/generators/migration.blade.php