Various improvements over the evening.
Merge branch 'master' of github.com:prykhodchenko/FMV_serv

Conflicts:
	fmv_server/data/data.py
Some more various improvements.