services izmeni
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/client/app/services/data/reports-service.js