day 15
Merge branch 'master' of https://github.com/Nadrshin/symfony2-jobeet

Conflicts:
	src/Ibw/JobeetBundle/Entity/Job.php
	src/Ibw/JobeetBundle/Resources/config/routing.yml