added location merge
Merge remote-tracking branch 'origin/master' into merge_location_set
set location sequences visible
added location layer to front for  use with plugins
updated combining methods. major overhaul
finalized location merge
Merge remote-tracking branch 'origin/master' into AlexDev