команды на ticket
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers/ticket.js
	app/partials/ticket.html
merge
Merge remote-tracking branch 'origin/master'
добавил applyPlugins
Merge remote-tracking branch 'origin/master'
много