add app location for java-agent
Fixed merge conflict(s)
Merge branch 'ramonskie-master'