bookmarklet integration
Merge branch 'stable' of https://github.com/corinnecurcie/Japan-Digital-Archive into stable

Conflicts:
	app/Resources/views/base.html.twig
	src/JDA/CoreBundle/Controller/BookmarkletController.php
	src/JDA/CoreBundle/Resources/config/routing.yml
	src/JDA/CoreBundle/Resources/translations/messages.en.xliff
	src/JDA/CoreBundle/Resources/translations/messages.ja.xliff
	src/JDA/CoreBundle/Resources/views/Bookmarklet/bookmarklet.html.twig
collection changes
Merge branch 'stable' of https://github.com/corinnecurcie/Japan-Digital-Archive into stable