Merge branch 'master' into development_aamir

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart

assets/langs/ar-SA.json

@@ -492,8 +492,6 @@
   "winnerSelectedRandomly": "سيتم اختيار الفائز عشوائياً من بين التصفيات.",
   "fingersCrossed": "تشابك الاصابع!!!",
   "congrats": "مبروك !!!",
-  "allQuestionsCorrect": "لقد أجبت على جميع الأسئلة بشكل صحيح."
+  "allQuestionsCorrect": "لقد أجبت على جميع الأسئلة بشكل صحيح.",
-
-  "none": "بدون",
   "typeheretoreply": "اكتب هنا للرد"
 }

assets/langs/en-US.json

@@ -492,7 +492,6 @@
   "winnerSelectedRandomly": "The winner will be selected randomly among the qualifiers.",
   "fingersCrossed": "Fingers Crossed!!!",
   "congrats": "Congratulations!!!",
-  "allQuestionsCorrect": "You have answered all questions correct"
+  "allQuestionsCorrect": "You have answered all questions correct",
-  "none": "None",
   "typeheretoreply": "Type here to reply"
 }