Merge branch 'master' into print_error

diff --cc lib/android/android.nit
index d49986b,6c6fb9b..42f3471
--- 1/lib/android/android.nit
--- 2/lib/android/android.nit
+++ b/lib/android/android.nit
@@@ -24,9 -24,16 +24,9 @@@ import platfor
  import native_app_glue
  import dalvik
  private import log
- private import android_data_store
+ private import data_store
  
 -# Uses Android logs to print everything
 -redef fun print(text) do log_write(priority_info, app.log_prefix.to_cstring, text.to_s.to_cstring)
 -
  redef class App
 -      redef fun log_error(msg) do log_write(priority_error, log_prefix.to_cstring, msg.to_cstring)
 -
 -      redef fun log_warning(msg) do log_write(priority_warn, log_prefix.to_cstring, msg.to_cstring)
 -
        redef fun init_window
        do
                super

diff --cc lib/linux/data_store.nit
Simple merge