fixed possible NPE
Merge branch 'master' into nook
fixed possible NPE
Merge branch 'master' into nook
fixed possible problem with closed DB
Merge branch 'master' into nook
synchronisation added: possible NPE fix
Merge branch 'master' into nook
version => 2.0.5
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml