CKEditor refinement
Merge branch 'master' of github.com:kavaleriy/budget

Conflicts:
	.idea/workspace.xml