Merging branch FCS-12 and master
Merge branch 'master' of https://github.com/agh-glk/fcs

Conflicts:
	fcs/fcs/manager/models.py
	fcs/fcs/manager/tests.py

Migration after changes in model