Un petit début...
Merge branch 'master' of http://github.com/yoannd/yallpaper

Conflicts:
	src/Yallpaper/AdminBundle/Resources/config/routing.yml