Merge commit 'ce59c8a215fe5bd6baa8de0cdf9f04951f4c4dc9'

Conflicts:
	OOP_V0/Application.cpp
	OOP_V0/Print.cpp
Merge branch 'All-OK'

Conflicts:
	OOP_V0/Application.cpp
	OOP_V0/Print.cpp