Document continued.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/main.iml
	src/test/test.iml
Merge branch 'master' of https://github.com/ncoelle/bdd-security