new icon
Merge branch 'DavidUserLogin'

Conflicts:
	app/assets/images/vbicon.ico
fixed new icon back to master