Merge pull request #19 from manneohlund/rc-5.0.0

Rc 5.0.0

Author: manneohlund

.gitignore

@@ -1,3 +1,6 @@
+# Project
+upload-keystore.jks
+
 # Built application files
 *.apk
 *.ap_
@@ -34,7 +37,7 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# IntelliJ
+# IntelliJ, Android Studio
 *.iml
 .idea/workspace.xml
 .idea/tasks.xml
@@ -45,10 +48,12 @@ captures/
 # Android Studio 3 in .gitignore file.
 .idea/caches/
 .idea/caches/build_file_checksums.ser
-/.idea/caches/build_file_checksums.ser
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/assetWizardSettings.xml
+.idea/markdown-navigator-enh.xml
+.idea/markdown-navigator.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@@ -66,13 +71,6 @@ freeline.py
 freeline/
 freeline_project_description.json
 
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
-
 # Version control
 vcs.xml