solve merge problems
Arays from repository Without 'n_' and bug not to 'sites' when looking for 'site/'

Signed-off-by: Berti Golf <berti@golf-net.de>