fixed control panel menu
Merge branch 'master' of https://github.com/trombastic/PyScada
Merge branch 'master' into Event_feature

Conflicts:
	pyscada/static/pyscada/css/pyscada-theme.css