Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/res/layout/activity_first_page_consent.xml

app/src/main/res/layout/activity_first_page_consent.xml

@@ -66,7 +66,7 @@
             android:id="@+id/ScrollViewQuestionnaire"
             style="@android:style/Widget.Material.ScrollView"
             android:layout_width="match_parent"
-            android:layout_height="409dp"
+            android:layout_height="404dp"
             android:layout_marginBottom="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"

app/src/main/res/layout/goal_diary.xml

@@ -31,7 +31,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            android:text="@string/goalDiaryTitle"
+            android:text="@string/goalDiaryTitlee"
             android:textAllCaps="false"
             android:textColor="@android:color/black"
             android:textSize="30sp"

app/src/main/res/values/strings.xml

@@ -79,6 +79,7 @@
 
 
     <string name="goalDiaryTitle">CURRENT STATE</string>
+    <string name="goalDiaryTitlee">GOAL DIARY</string>
     <!--<string name="greatText">GREAT! My name is Alex and I will do this experiment together with you. As your companion, I will reflect your mood:</string>-->
     <string name="greatText1">GREAT! My name is Alex and I will do this experiment together with you. As your companion, I will reflect your mood. I can see you are ok at the moment. That is great! We will work together to keep it like this and even improve your state.</string>
     <string name="greatText2">GREAT! My name is Alex and I will do this experiment together with you. As your companion, I will reflect your mood. I see that you feel blue. We will work together to make you feel better and you will see, it is not hard at all.</string>