Merge tag '0.25' into develop

* Enhancements
  * [#305] MatrixQuestion doesn't need to scroll
  * [#306] If intro text is empty, hide the extra space
  * Add mother tongue in profile and first launch
* Bug fixes
  * Add Jérôme in Credits, was missing
Update readme
Move gradle.properties to its own place in library
Add license for library
Fix license/copying notices
Finish fixing issue #337 ("Skip")
Fix NullPointerException in DailySequenceService
Merge pull request #342 from daydreaming-experiment/feature/issue-332

Fix NullPointerException in DailySequenceService
Fix StringIndexOutOfBoundsException in SettingsActivity
Code style
Fix morning questionnaire notification

It will not beep, not flash, not vibrate (since by default it appears at
5am).

Also removed the custom sound for notifications, which was only working
when not asked to beep. I think this would be better as a full feature
where the user can choose his own notification sound, rather than a
half-baked one.
diff --git
a/daydreaming/src/main/java/com/brainydroid/daydreaming/background/DailySequenceService.java
b/daydreaming/src/main/java/com/brainydroid/daydreaming/background/DailySequenceService.java
index e52ef91..73e087c 100644 ---
a/daydreaming/src/main/java/com/brainydroid/daydreaming/background/DailySequenceService.java
+++
b/daydreaming/src/main/java/com/brainydroid/daydreaming/background/DailySequenceService.java
@@ -6,7 +6,6 @@ import android.app.NotificationManager; import
android.app.PendingIntent; import android.content.Intent; import
android.content.SharedPreferences; -import android.net.Uri; import
android.os.IBinder; import android.os.SystemClock; import
android.support.v4.app.NotificationCompat; @@ -251,15 +250,14 @@ public
class DailySequenceService extends RoboService {

         int flags = 0;

-
-        // Should we flash the LED?
-        if (sharedPreferences.getBoolean("notification_blink_key", true)) {
-            Logger.v(TAG, "Activating lights");
-            flags |= Notification.DEFAULT_LIGHTS;
-        }
-
-        // If this is NOT an MQ, we can vibrate and beep.
+        // If this is NOT an MQ, we can flash lights, vibrate and beep.
         if (!sequenceType.equals(Sequence.TYPE_MORNING_QUESTIONNAIRE)) {
+            // Should we flash the LED?
+            if (sharedPreferences.getBoolean("notification_blink_key", true)) {
+                Logger.v(TAG, "Activating lights");
+                flags |= Notification.DEFAULT_LIGHTS;
+            }
+
             // Should we vibrate?
             if (sharedPreferences.getBoolean("notification_vibrator_key", true)) {
                 Logger.v(TAG, "Activating vibration");
@@ -299,12 +297,6 @@ public class DailySequenceService extends RoboService {

         Notification notification = notificationBuilder.build();

-        // How to beep?
-        if (sharedPreferences.getBoolean("notification_sound_key", true)) {
-            Logger.v(TAG, "Adding custom sound");
-            notification.sound = Uri.parse("android.resource://" + "com.brainydroid.daydreaming" + "/" + R.raw.notification);
-        }
-
         // Get a proper id for the notification, to replace the right notifications
         // That way only one of morning notification and one evening notification will ever be there
         notificationManager.cancel(sequenceType, sequence.getRecurrentNotificationId());
Fix error in sync pooling: was using SystemClock instead of Calendar
Do not inject json-marked members, they get overridden
Also upload incomplete morning/evening questionnaires
Merge pull request #343 from daydreaming-experiment/feature/issue-331

Feature/issue 331
Merge pull request #346 from daydreaming-experiment/feature/issue-335-empty-results

Feature/issue 335 empty results
edit string text; @jsackuratens and @MklBst, those are string edits you can do yourself
adding storageVersion check in statusManager
Merge pull request #347 from daydreaming-experiment/feature/issue-316

plus mineur tu meurs, merging
Merge branch 'feature/issue-330-versioning-storage' of github.com:daydreaming-experiment/app into origin/feature/issue-330-versioning-storage