Merge branch 'master' into data_store

diff --cc examples/mnit_simple/src/complete_simple_android.nit
index 7403814,2f4f467..8700ab2
--- 1/examples/mnit_simple/src/complete_simple_android.nit
--- 2/examples/mnit_simple/src/complete_simple_android.nit
+++ b/examples/mnit_simple/src/complete_simple_android.nit
@@@ -23,4 -24,4 +24,5 @@@ import test_audi
  import test_shared_preferences
  import test_assets_and_resources
  import test_target_api
 +import test_data_store
+ import test_intent

diff --cc lib/mnit_linux/linux_app.nit
Simple merge