confirm that empty IDs are really wanted
always ask
Adjust import order
Adjust copyright headers
Trivial spacing changes to conform to style guide
Adjust variable/member naming to conform to style guide

In some cases change member accessibility, so the naming matches.
Also, some key words were reordered to comply with JLS suggestions.
Rearrange too long lines
Add missing and curly brackets and fix others

Style guide demands them even for single-line blocks, and opening
curly brackets never appear on a line on their own.
Suppress checkstyle for some files
Merge pull request #502 from thi/conform-to-style-guide

Conform to style guide, #466
Update from transifex
Spacing corrections
Replace wildcard imports with explicit imports
Add wildcard import warning to checkstyle configuration
Merge pull request #507 from thi/fix-wildcard-imports

Fix wildcard imports
Fix build
Started changelog for 2.5
Cleanup example code
Rename "pass phrase" to "passphrase"
Rename "armour" to "armor"