Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

Conflicts:
	base/serials_trb3.db
	web/htdocs/tools/pwr/pwr.conf

diff --cc web/htdocs/tools/pwr/pwr.conf
index ea8b731350017aa108ef818048e26f5789284fcd,92d40633113fe03ef17bb4d8abeb9a5a7c7a0b43..61e7917f3feaa20edda14c0b457ca4b8ec9ba07d
--- 1/web/htdocs/tools/pwr/pwr.conf
--- 2/web/htdocs/tools/pwr/pwr.conf
+++ b/web/htdocs/tools/pwr/pwr.conf
@@@ -7,4 -9,4 +7,5 @@@ Content-type: text/htm
  
  PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
  //PWRSPLY:/dev/ttyUSB0:115200:HMP4030:HMP:3
- //PWRSPLY:/dev/ttyUSB1:2400:PSP405:PSP:1
+ //PWRSPLY:/dev/ttyUSB1:2400:PSP405:PSP:1
++