merge
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml
task-simpl
invoice-bag
task-sipml
task-sipml
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml

Conflicts:
	src/ITDoors/CommonBundle
	src/ITDoors/ControllingBundle/Services/InvoiceService.php
task-sipml
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml

Conflicts:
	src/ITDoors/SipBundle/Resources/views/Call/index.html.twig
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml

Conflicts:
	src/ITDoors/SipBundle/Command/HistoryCommand.php
Merge branch 'task-sipml' of github.com:itdoors/sd into task-sipml

Conflicts:
	src/ITDoors/SipBundle/Command/HistoryCommand.php
task-sipml
task-sipml
task-sipml
task-sipml
task-sipml
task-sipml
task-sipml
task-sipml