bootstrap
Merge branch 'master' into deadbolt

Conflicts:
	build.sbt
deadbolt
Merge pull request #1 from aybek/deadbolt

Deadbolt