Merge branch 'dmitryhd-dev' into niksh-dev
Some little changes.
Some little changes.
replaced damn icon with the one from dimert's branch
Changed paths
template for alerts
Merge branch 'dmitryhd-dev' into niksh-dev

Conflicts:
	nms_app/plot.py
	nms_app/views.py
	playground/settings.py
	playground/wsgi.py
Set timezone to none.
alerts nearly finished
Added alert support
Added alerts
Merge branch 'niksh-dev' into dmitryhd-dev
small syntax error in alerts fixed