Merge branch 'master' into FCS-40

Conflicts:
	playbook.yml
	requirements.txt
Merge branch 'FCS-40' of https://github.com/agh-glk/fcs into FCS-40