checkstyle
Merge branch 'master' into checkstyle
Finished surfer checkstyle
fixed surferDB checkstyle
Merge branch 'checkstyle'