Merge pull request #68 from gregorybesson/develop

Refactoring authorization layer
Merge pull request #69 from gregorybesson/master

Merge pull request #68 from gregorybesson/develop