refactor code
Merge branch 'master' into search-fix

Conflicts:
	db/sphinx/development/band_core.spa
	db/sphinx/development/band_core.spd
	db/sphinx/development/band_core.sph
	db/sphinx/development/band_core.spi
	db/sphinx/development/band_instrumentalist_target_core.spa
	db/sphinx/development/band_instrumentalist_target_core.spd
	db/sphinx/development/band_instrumentalist_target_core.sph
	db/sphinx/development/band_instrumentalist_target_core.spi
	db/sphinx/development/band_instrumentalist_target_core.sps
	db/sphinx/development/musician_core.spa
	db/sphinx/development/musician_core.spd
	db/sphinx/development/musician_core.sph
	db/sphinx/development/musician_core.spi
	db/sphinx/development/musician_core.sps
	db/sphinx/development/musician_instrument_core.spa
	db/sphinx/development/musician_instrument_core.spd
	db/sphinx/development/musician_instrument_core.sph
	db/sphinx/development/musician_instrument_core.spi
	db/sphinx/development/musician_instrument_core.sps
	db/sphinx/development/musician_instrumentalist_target_core.spa
	db/sphinx/development/musician_instrumentalist_target_core.spd
	db/sphinx/development/musician_instrumentalist_target_core.sph
	db/sphinx/development/musician_instrumentalist_target_core.spi
	db/sphinx/development/musician_instrumentalist_target_core.sps
	log/development.sphinx.pid