Merge branch 'HEAD' of https://github.com/tyndale/step.git

Conflicts:
	step-core/src/main/resources/com/tyndalehouse/step/core/data/create/lexicon/lexicon_hebrew.txt
	step-web/src/main/webapp/js/defaults/step.defaults.js
test