teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaApp/src/javaapp/JavaApp.java