added view model to set different sets of pages
updated version numbers
updated jquery and bootstrap, new login page, improvments in view
Merge branch 'master' into Event_feature

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