Merge branch 'dmitryhd-dev' into niksh-dev

Conflicts:
	nms_app/parameters.py
Merge branch 'dmitryhd-dev' into niksh-dev

Conflicts:
	nms_app/parameters.py