Summercamp 2013
Merge branch 'master' of ssh://github.com/branleb/jupis-camp-online-application

Conflicts:
	index.php