Merge branch 'feature/grammarv2bis' into develop

Conflicts:
	daydreaming/src/main/java/com/brainydroid/daydreaming/db/ParametersStorage.java
	daydreaming/src/main/java/com/brainydroid/daydreaming/db/ProfileStorage.java
	daydreaming/src/main/java/com/brainydroid/daydreaming/ui/firstlaunchsequence/FirstLaunch01DescriptionActivity.java
	daydreaming/src/main/java/com/brainydroid/daydreaming/ui/firstlaunchsequence/FirstLaunch02TermsActivity.java
	daydreaming/src/main/java/com/brainydroid/daydreaming/ui/firstlaunchsequence/FirstLaunch05MeasuresActivity.java
Update profile testing with default value for version
Merge branch 'develop' of github.com:daydreaming-experiment/app into develop

Conflicts:
	daydreaming/src/main/java/com/brainydroid/daydreaming/db/ParametersStorage.java
	daydreaming/src/main/java/com/brainydroid/daydreaming/db/ProfileStorage.java
	daydreaming/src/main/java/com/brainydroid/daydreaming/ui/firstlaunchsequence/FirstLaunch01DescriptionActivity.java