ff
ff
Merge branch 'master' of https://github.com/stefanoantonel/ChietiV2.git

Conflicts:
	Chieti/ChietiDj/urls.pyc
	Chieti/chieti/__init__.pyc
	Chieti/chieti/admin.pyc
	Chieti/chieti/mainHead.pyc
	Chieti/chieti/models.pyc
	Chieti/chieti/urls.pyc