fixed the double content issue in /bookmarks
Merge branch 'master' of https://github.com/JAWA21/markularity

Conflicts:
	app/tmp/cache/cake_toolbar_cachee41137025a9e864dce58d2d3ba2cc19c
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log
maybe this will work. i don't know. committing to pull
Merge branch 'master' of https://github.com/JAWA21/markularity