Merge branch 'master' into dev

# Conflicts:
#	app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
#	app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
#	app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
#	uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
#	uhabits-android/src/main/res/values-id/strings.xml
#	uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java

uhabits-android/src/main/res/layout/about.xml

@@ -146,6 +146,14 @@
                     style="@style/About.Item"
                     android:text="Angga Rifandi (Bahasa Indonesia)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="raden20 (Bahasa Indonesia)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="azzamsa (Bahasa Indonesia)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="David Nos (Català)"/>
@@ -230,6 +238,10 @@
                     style="@style/About.Item"
                     android:text="Jelle den Butter (Nederlands)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="nitovf9292 (Norsk)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Adam Jurkiewicz (Polski)"/>
@@ -256,7 +268,7 @@
 
                 <TextView
                     style="@style/About.Item"
-                    android:text="Dalecarlian (Svenska)"/>
+                    android:text="Alexander Jansson (Svenska)"/>
 
                 <TextView
                     style="@style/About.Item"
@@ -278,6 +290,10 @@
                     style="@style/About.Item"
                     android:text="Rystard (Українська)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Oglaigh Rystard (Українська)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Limin Lu (中文)"/>
@@ -314,6 +330,10 @@
                     style="@style/About.Item"
                     android:text="Josh Graham (한국어 )"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Seoyul (한국어 )"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Aman Satnami (हिन्दी)"/>
@@ -326,6 +346,10 @@
                     style="@style/About.Item"
                     android:text="Yoav Argov (עברית‎)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Mahdi Nasiri (فارسی‎)"/>
+
             </LinearLayout>
         </LinearLayout>
     </ScrollView>