local changes
testMerge branch 'master' of https://github.com/RafalManka/fiszki_webAPI

Conflicts:
	.idea/workspace.xml
fixed csv importing layouts and cleaned a little