fixed NPE
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into fc-ics
Merge branch 'fc' into fc-ics
Merge branch 'master' into fc
updated version num
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into fc-ics
Merge branch 'master' into fc
Merge branch 'fc' into fc-ics
version => 1.10.0.2
one more NPE

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into fc
Merge branch 'ice-cream-sandwich' into fc-ics
Merge branch 'fc' into fc-ics