fix javadocs
stop task that prepears application's start
use proper variable
code clean up
Merge branch 'master' into IDEX-476