NewOrder
Merge origin/master

Conflicts:
	JavaApplication7/src/javaapplication7/JavaApplication7.java