Push with Karma test and updating in view 4 is added
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/components/factories.js