Added some zinnia templates (to be modified in a later commit)
more zinnia customization
Merge branch 'newmodel' of https://github.com/shygon/kikar-hamedina into shygon-newmodel

Conflicts:
	Vagrantfile
Merge branch 'shygon-newmodel' into newmodel
Fix local bug in zinnia blog