synchronisation with intro branch: special entries in native code & in java
new style intro text: generator + Russian data
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2