Merge branch 'master' into 'checkup-email'

# Conflicts:
#   app/config/appConfig.js
#   app/services/notificationService.js

app/config/appConfig.js

@@ -34,6 +34,11 @@ const PRINT_CRAWLER_DEBUG = process.env.PRINT_CRAWLER_DEBUG_INFO || 0;
 
 const API_MAP_KEY = process.env.API_MAP_KEY || "";
 
+const PROSTOR_LOGIN = {
+  EMAIL: process.env.PROSTOR_LOGIN_EMAIL,
+  PASSWORD: process.env.PROSTOR_LOGIN_PASS
+};
+
 module.exports = {
   APP_PORT,
   APP_URL,
@@ -45,5 +50,6 @@ module.exports = {
   MAX_REAL_ESTATES_IN_FIRST_EMAIL,
   PRINT_CRAWLER_DEBUG,
   API_MAP_KEY,
-  CHECK_UP_DAYS
+  CHECK_UP_DAYS,
+  PROSTOR_LOGIN
 };