message bug
Merge branch 'hotfix-2.1'

Conflicts:
	TestProject/src/main/java/com/lille1/test/App.java