Merge branch 'dev' into 'master'

Dev

See merge request !17

.gitignore

@@ -22,4 +22,4 @@ __pycache__
 /csv/article/
 /static/
 /media/
-config_app/settings/prod.env
+config_app/settings/master.env

Envoy.blade.php

@@ -22,7 +22,7 @@ echo '{{ $new_release_dir }}'
 [ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }}
 @if ($branch)
     git clone -b {{ $branch }} {{ $repository }} {{ $new_release_dir }}
-    ln -nfs {{ $app_dir }}/configs/master/master.env {{ $new_release_dir }}/config_app/settings/master.env
+    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/prod.env
     ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/dev.env
 @endif
 @endtask

lms/settings.py

@@ -21,8 +21,8 @@ if MOD == 'Test':
 elif MOD == 'Dev':
     environ.Env.read_env(str(root) + '/config_app/settings/dev.env')
 
-elif MOD == 'Prod':
+elif MOD == 'Master':
-    environ.Env.read_env(str(root) + '/config_app/settings/prod.env')
+    environ.Env.read_env(str(root) + '/config_app/settings/master.env')
 
 else:
     raise ImportError('no such environ ' + MOD)