update shelfs
resolve conflit

Merge branch 'master' of https://github.com/omegas27/CAeSAR

Conflicts:
	src/Caesar/AdminBundle/Controller/ShelfController.php