Delay flush of content.data to hard drive with time parameter (default 300 sec).
Merge remote-tracking branch 'origin/patch_1_0_1' into patch_1_0_1

Conflicts:
	lib/content_server/queue_indexer.rb