Merge branch 'tag_cloud' into plugins_test

Conflicts:
	Gemfile
	Gemfile.lock
	app/presenters/locomotive/content_entry_presenter.rb
	lib/locomotive/liquid/drops/content_types.rb
	lib/locomotive/render.rb
Merge branch 'remote_content' into plugins_test

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/locomotive/api/content_entries_controller.rb
	app/helpers/locomotive/custom_fields_helper.rb
	app/models/locomotive/content_type.rb
	app/presenters/locomotive/content_type_presenter.rb
	app/views/locomotive/content_entries/_list.html.haml
	app/views/locomotive/content_entries/edit.html.haml
	app/views/locomotive/content_entries/index.html.haml
	app/views/locomotive/content_types/edit.html.haml
	app/views/locomotive/shared/menu/_contents.html.haml
Finish merge