fix coding style : remove tab chars and add spaces
fix coding style : add newline add end of file
fix coding style : remove trailing space
fix JavaDoc
add parenthesis to if statement
rename variable
Merge branch 'master' into maven