Merge remote-tracking branch 'origin/master'

# Conflicts:
#	production.db

.gitignore

@@ -19,6 +19,7 @@
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
+.idea/compiler.xml
 
 # Gradle:
 .idea/gradle.xml
@@ -27,6 +28,10 @@
 # Mongo Explorer plugin:
 .idea/mongoSettings.xml
 
+## Database files:
+/production.db
+*.db
+
 ## File-based project format:
 *.iws
 
@@ -53,5 +58,3 @@ fabric.properties
 
 # *.iml
 # modules.xml
-
-*.db