borrowings et tags
fix images
fix conflict
Merge branch 'master' of https://github.com/omegas27/CAeSAR

Conflicts:
	src/Caesar/UserBundle/Entity/BorrowingArchive.php