Fixed running ContextRoles test
Trigger Travis
Merge branch 'master' of https://github.com/martijnversluis/Cake-CBAC

Conflicts:
	.travis.yml