eval
Merge branch 'master' of https://github.com/edugasser/ccm

Conflicts:
	ccm/util.py
	church/migrations/0001_initial.pyc
	church/migrations/__init__.pyc
	templates/base.html