new events
new events
Merge branch 'master' of https://github.com/khellhake/c3church_2013

Conflicts:
	index.php