+ logging
Merge branch 'origin/Stream'

Conflicts:
	Java+Scala/testapp/app/controllers/Application.java