Merge commit 'cbca01fbca22f46ca2ed144bca31bb8b173a7552'

Conflicts:
	modules/abre/manifests/django/project.pp
Fixes to django stuff for multiple sites
Apparently, collectstatic depends on psycopg2
Add calendar server
Merge https://github.com/adambrenecki/puppetfiles

Conflicts:
	manifests/django/project.pp