update
Merge branch 'master' of https://github.com/andyhu/entrust

Conflicts:
	src/Zizaco/Entrust/EntrustRole.php