alert sort, param alert state, bugfixes, web improve
Merge branch 'dmitryhd-dev' into niksh-dev

Conflicts:
	nms_app/test.py
Improved alerts test