Merge branch '2.0_bugfix'
Merge branch '2.0_bugfix'
More consistent handling of space for page numbers.
Update version number for 2.0.4
Update Spanish translation.
Made pagenumberview transparent again.
Updated version number.
Merge branch '2.0_bugfix'
Merge branch 'master' into catalog_update

Conflicts:
	AndroidManifest.xml
	pom.xml