# Conflicts:
#	lib/api/entities.rb
#	lib/api/search.rb
#	lib/api/users.rb
#	qa/qa.rb

[ci skip]