Merge branch 'origin/develop'
css/view modifications

I have updated the css and html files with new styling for the main
login screen and user panel. Can we roll these out to see how they
apply to the current build? I will follow up with an email to reference
the modifications.
Merge branch 'origin/van-styling'

Conflicts:
	WingWire2.0/app/css/app.css