Update header.
Improve debug comments.
Try to move testing specific code in Import and Output subclasses.
Merge branch 'master' into save_kdbx
Further .kdbx refactoring.
Merge branch 'master' into save_kdbx

Conflicts:
	src/com/keepassdroid/database/PwDatabaseV3.java
	src/com/keepassdroid/database/load/ImporterV3.java
Fix bad merge.
Updates from sdk upgrades.
Partial implementation of kdbx header output.
Rename readShort to readUShort
Move writeShort in LEDataOutputStream.
Finish implementing kdbx header output.
Merge branch 'master' into save_kdbx

Conflicts:
	.classpath
	src/com/keepassdroid/database/load/ImporterV4.java
	tests/.classpath
Update kdbx database version to most recent.
Improve usability of generate password functionality.

	* res/layout/generate_password.xml: Add sensible default values.
	Move password field and generate button to top for visibility.
	Make text input single line and password field monospaced.

	* src/com/keepassdroid/GeneratePasswordActivity.java (onCreate): Pre
	populate the generated password.
	(fillPassword): Factor out onClick code so we can call it from onCreate.
Trim whitespace from query strings
Update Catalan translations.
Escape apostrophe.
fix typo.
Merge remote-tracking branch 'josefwells/trimsearch'