fix
Merge branch 'master' of https://github.com/SergeevDmitry/t-arona

Conflicts:
	src/TArona/FtdBundle/Resources/public/admin/js/app/controllers.js
fix
Merge branch 'master' of https://github.com/SergeevDmitry/t-arona