Working progressbar in view5
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/view2/view2.html