up
Merge branch 'djangodev' of https://github.com/andriykohut/LV-090_LAMP into djangodev
Merge branch 'djangodev' of https://github.com/andriykohut/LV-090_LAMP into djangodev

Conflicts:
	ipmanager/templates/menu.html