Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges

Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java

.travis.yml

@@ -32,7 +32,7 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-24.0.3
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
     - android-25

Habitica/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="164"
+    android:versionCode="165"
     android:versionName="1.0"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
@@ -20,7 +20,6 @@
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" tools:node="remove" />
 
     <application
         android:name=".HabiticaApplication"
@@ -32,6 +31,7 @@
         <activity
             android:name=".ui.activities.MainActivity"
             android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar.Transparent"
             android:windowSoftInputMode="stateHidden|adjustPan"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -49,12 +49,13 @@
         <activity
             android:name=".ui.activities.LoginActivity"
             android:label="@string/LoginActivityName"
-            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:theme="@style/AppTheme.NoActionBar.Transparent"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait">
         </activity>
         <activity
             android:name=".ui.activities.IntroActivity"
+            android:theme="@style/AppTheme.NoActionBar.Transparent"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait">
         </activity>

Habitica/assets/migrations/Habitica/34.sql

@@ -0,0 +1 @@
+ALTER TABLE ItemData ADD COLUMN specialClass varchar(255);

Habitica/build.gradle

@@ -65,13 +65,13 @@ dependencies {
     apt 'com.google.dagger:dagger-compiler:2.8'
     provided 'org.glassfish:javax.annotation:10.0-b28'
     //App Compatibility and Material Design
-    compile('com.mikepenz:materialdrawer:5.3.6@aar') {
+    compile('com.mikepenz:materialdrawer:5.8.3@aar') {
         transitive = true
     }
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.android.support:recyclerview-v7:25.3.0'
-    compile 'com.android.support:preference-v14:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:preference-v14:25.3.1'
     compile 'com.android.support:multidex:1.0.1'
 
     //QR Code
@@ -147,6 +147,8 @@ dependencies {
 
     compile 'org.apmem.tools:layouts:1.10@aar'
 
+    compile 'com.roughike:bottom-bar:2.2.0'
+
     compile(project(':seeds-sdk')) {
         exclude group: 'com.google.android.gms'
         exclude group: 'com.android.support', module: 'multidex'