m
a bunch of things I haven't committed

pages, entities new mapping, contest
CONFLICTS

Conflicts:
	Symfony/app/cache/dev/appDevDebugProjectContainer.php
	Symfony/app/cache/dev/appDevDebugProjectContainer.php.meta
	Symfony/app/cache/dev/appDevDebugProjectContainer.xml
	Symfony/app/cache/dev/appDevDebugProjectContainerCompiler.log
	Symfony/app/cache/dev/appDevUrlGenerator.php.meta
	Symfony/app/cache/dev/appDevUrlMatcher.php.meta
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/logs/dev.log