Merge branches 'version3' and 'temp12' into version3
config network file adjusted
Merge branches 'poi' and 'version3' into poi