changed ignore rules
changed file ending "yaml" into "yml"
Merge branch 'master' of https://github.com/florianpreusner/floeH

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	app/config/parameters.yml
	src/floeH/MainBundle/Resources/config/routing.yml