Merge branch 'master' of https://github.com/grnet/hch-roll

Conflicts:
	hch-roll/local_settings.py
	hch-roll/settings.py
	roll/forms.py
	roll/models.py