item text rendered
map search queries now split by japanese space

Fixes #608
correctly split items before sending query

actually fixes #608; however, things with both english and japanese
spaces will still have weird split results
fixed the description in the item page
"scroll issue fixed"
Merge branch 'master' of https://github.com/corinnecurcie/Japan-Digital-Archive
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
css merge
collection edit presentation link
Merge pull request #714 from corinnecurcie/master

Master
collection changes
Merge branch 'stable' of https://github.com/corinnecurcie/Japan-Digital-Archive into stable
resolved merge conflicts
Merge remote-tracking branch 'upstream/stable' into stable

Conflicts:
	src/JDA/CoreBundle/Resources/views/Item/item.html.twig
	src/JDA/CoreBundle/Resources/views/Team/team.html.twig
	web/js/app/views/jda.view.event-map.js
merge conflicts fixed