1.8
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/App/AppTest.java