Old stuff edited in January
removed conflicting files
undone deletion
Merge branch 'new_branch_name'

Conflicts:
	ProjectK/Symfony/src/Falshcards/FalshcardsBundle/Resources/views/Card/erroroccured.html.twig