Restart!
Merge branch 'master' of https://github.com/mamiksik/cms-kaminky

Conflicts:
	.idea/workspace.xml