update
Merge branch 'master' of github.com:fabaff/high-rack-warehouse

Conflicts:
	docs/requirement-document.tex
update