Now uses the main feed from the site.
Put URL for the sync server in the configuration.
Added simple management screen for custom feeds.
First working versions of manageable custom sites.
Added import for old calibre preferences.
Import fixes.
Rescales icons to max thumbnail size.
Merge branch 'master' into catalog_saik

Conflicts:
	src/net/nightwhistler/pageturner/activity/CatalogActivity.java
	src/net/nightwhistler/pageturner/activity/LibraryActivity.java
Merged master.
Small fix to catalog-fragment.
Merge branch 'master' into catalog_update

Conflicts:
	src/net/nightwhistler/pageturner/activity/CatalogFragment.java
	src/net/nightwhistler/pageturner/activity/LibraryFragment.java
Incomplete merge.
Merge branch 'master' into catalog_update
Merge branch 'master' into catalog_update
Merge branch 'master' into catalog_update
Revert "Made dialog-fragments retain state. Hopefully fixes #231"

This reverts commit 0f9f69dee52affb101e052cbee3e65a8156fceac.
Revert "refactor Dialogs to use DialogFragments"

This reverts commit 19dacd6805784409119ffbe1318f84273dbf00d9.

Conflicts:

	src/net/nightwhistler/pageturner/activity/CatalogFragment.java
	src/net/nightwhistler/pageturner/activity/LibraryFragment.java
Merge branch 'master' into catalog_update

Conflicts:
	src/net/nightwhistler/pageturner/activity/CatalogFragment.java
	src/net/nightwhistler/pageturner/activity/LibraryFragment.java
Small null-fix
Corrected merge error.