change dev1 from develop br
Merge branch 'develop' into mbr1

Conflicts:
	Test/src/dev1.java