settings changed, added log function and new test
test xx
Merge branch 'dmitryhd-dev' of https://github.com/dmitryhd/NMS into dmitryhd-dev
Merge branch 'server' into dmitryhd-dev
Download manager added, great changes are coming
meet the new collector!
another major refactoring
aaaah, to many changes, jquery flot added, major refactor
commit where nothing works
Merge branch 'server' into niksh-dev
Merge branch 'dmitryhd-dev' into niksh-dev

Conflicts:
	nms_app/views.py
	nms_site.db
Merge branch 'niksh-dev' of https://github.com/dmitryhd/NMS into niksh-dev