small UI tweak
fix for sure issue #745 and do not rely on the order of ancestors returned by MongoDB
keep the rebuild_serialized_page_templates rake task safe
use the time zone of the site when the API is used
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock