- Correction bug for fileGeneration attribute in LimaDetector
Merge remote branch 'origin/master'

Conflicts:
	mvn_build.py