Dev2 Commit 2
Merge branch 'modif'

Conflicts:
	Test_Final_Java/src/Page1.java