Fixing problems in registration and account edit
CS fix
Small cudi sale fixes with returned articles
output of git pre-commit hook is shorter now
only apply checks to code being committed
also, use prettier logging
fixes #221
Merge branch 'master' of github.com:LitusProject/Litus
Some ticket bundle sale fixes
CudiBundle WIP
Merge branch 'master' into dev-form

Conflicts:
	module/CommonBundle/Controller/AccountController.php
	module/CommonBundle/Resources/views/common/account/edit.twig
	module/MailBundle/Controller/Admin/PromotionController.php
	module/SecretaryBundle/Controller/RegistrationController.php
	module/SecretaryBundle/Resources/views/secretary/registration/edit.twig
Merge branch 'dev-form' of github.com:LitusProject/Litus into dev-form
don't git-stash when merging etc.
Merge branch 'master' into dev-form
Added some ids
Merge branch 'dev-form' into dev-amount-type

Conflicts:
	module/TicketBundle/Form/Sale/Ticket/Add.php
Small fix with types