IVONA
Merge branch 'master' of github.com:m3lm4n/mediahackday

Conflicts:
	synchronize/models.py