Merge branch 'master' of https://bitbucket.org/dakim/church-new

# Conflicts:
#	.gitignore
#	modules/Church/Http/Controllers/Reports/RegionalSummary.php
