use jdk 1.6 @Overrides instead of /** {@inheritDoc} */ doc tags
Merge pull request #20 from heuermh/master

Minor source cleanup, use jdk 1.6 @Overrides instead of /** {@inheritDoc} */ doc tags