grammar
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
config speed optimization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
VERSION => 1.9.6
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into yota2
better processing for file errors
Merge branch 'master' into ice-cream-sandwich
re-ordering
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2