grammar
Merge branch 'master' into nook
config speed optimization
Merge branch 'master' into nook
VERSION => 1.9.6
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml
better processing for file errors
re-ordering
Merge branch 'master' into nook