Merge pull request #94 from alexzaporozhets/nonamebranch

Nonamebranch
tarifs plugin
tarifs plugin
Merge remote-tracking branch 'origin/master' into nonamebranch
changed settings system
Merge pull request #95 from alexzaporozhets/environment

Environment
added settings/local.py
plugin-virtual