Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	README.md
	app/assets/javascripts/admin/templates/groups.js.handlebars
	app/assets/javascripts/discourse.js
	app/assets/javascripts/discourse/controllers/list_controller.js.erb
	app/assets/javascripts/discourse/controllers/list_top_controller.js
	app/assets/javascripts/discourse/initializers/1_init_message_bus.js
	app/assets/javascripts/discourse/initializers/page_tracking.js
	app/assets/javascripts/discourse/lib/autocomplete.js
	app/assets/javascripts/discourse/lib/click_track.js
	app/assets/javascripts/discourse/lib/url.js
	app/assets/javascripts/discourse/models/nav_item.js
	app/assets/javascripts/discourse/models/top_list.js
	app/assets/javascripts/discourse/routes/application_routes.js
	app/assets/javascripts/discourse/routes/filtered_list_route.js
	app/assets/javascripts/discourse/routes/list_categories_route.js
	app/assets/javascripts/discourse/routes/list_category_route.js
	app/assets/javascripts/discourse/routes/list_top_route.js
	app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
	app/assets/javascripts/discourse/templates/list/categories.js.handlebars
	app/controllers/list_controller.rb
	app/serializers/top_list_serializer.rb
	app/views/embed/comments.html.erb
	config/locales/client.cs.yml
	config/locales/client.de.yml
	config/locales/client.en.yml
	config/locales/client.es.yml
	config/locales/client.fr.yml
	config/locales/client.it.yml
	config/locales/client.ja.yml
	config/locales/client.ko.yml
	config/locales/client.nl.yml
	config/locales/client.pt_BR.yml
	config/locales/client.ru.yml
	config/locales/client.sv.yml
	config/locales/client.zh_CN.yml
	config/locales/client.zh_TW.yml
	config/routes.rb
	docs/DEVELOPMENT-OSX-NATIVE.md
	lib/guardian.rb
	lib/guardian/category_guardian.rb
	lib/guardian/post_guardian.rb
	lib/guardian/topic_guardian.rb
	lib/topic_query.rb
	spec/components/pretty_text_spec.rb
	test/javascripts/lib/url_test.js
Updated Ukrainian translation
Updated Ukrainian translation files to correspond with the updates in English version
Merge branch 'master' of https://github.com/Maximaximum/discourse
Updated Ukrainian translation
Updated Ukrainian translation
Updated Ukrainian translation
Updated Ukrainian translation
Updated Ukrainian translation
Merge branch 'master' of github.com:Maximaximum/discourse

Conflicts:
	app/assets/javascripts/discourse/controllers/list_controller.js.erb
	app/assets/javascripts/discourse/controllers/list_top_controller.js
	app/assets/javascripts/discourse/routes/filtered_list_route.js
	app/assets/javascripts/discourse/routes/list_categories_route.js
	app/assets/javascripts/discourse/routes/list_category_route.js
	app/assets/javascripts/discourse/routes/list_top_route.js
	app/assets/javascripts/discourse/templates/list/categories.js.handlebars
	config/locales/client.uk.yml
Merge branch 't pull master' of github.com:Maximaximum/discourse