Revert 7eca3a2..b73272a

This rolls back to commit 7eca3a292981e67cc6b6d9c4609b41fdde106f60.
Revert "zizaco/entrust changed to JoeChilds/entrust in order to run app on 5.3"

This reverts commit 7eca3a292981e67cc6b6d9c4609b41fdde106f60.
modifies