Some changes
Merge branch 'master' of https://github.com/movsesyan1970/pg-Mon

Conflicts:
	pg_mon_new/settings.py