Merge branch 'master' of https://github.com/Smurf/accelerate-backend-kit

Conflicts:
	backend-kit/accelerate-backend-kit.cabal