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

Conflicts:
	ipmanager/templates/menu.html