Commit de rama
Merge commit '2d596b0c0b1d5c1de43474b5ed6bf14f1587f26d'

Conflicts:
	JavaApplication2/src/javaapplication2/NewClass.java