Separate work search from the rest add aliases, remove ACs
Order Edit release the same as Add release
Merge branch 'beta' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6209

Conflicts:
	lib/MusicBrainz/Server/Data/Search.pm
Merge branch 'beta' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6223

Conflicts:
	root/edit/details/edit_release.tt
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-6209' into beta

* reosarevok-bitbucket/mbs-6209:
  Separate work search from the rest add aliases, remove ACs
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-6223' into beta

* reosarevok-bitbucket/mbs-6223:
  Order Edit release the same as Add release