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

Conflicts:
	web/htdocs/tools/pwr/pwr.conf

diff --cc web/htdocs/tools/pwr/pwr.conf
index 316ba45837936018a7f2b814850028541488d05c,0e8e681247b3b69ad91bf823876a0e6f32ab3d74..6ae274b76106d5ee1184590368b95cdf5e46a05e
--- 1/web/htdocs/tools/pwr/pwr.conf
--- 2/web/htdocs/tools/pwr/pwr.conf
+++ b/web/htdocs/tools/pwr/pwr.conf
@@@ -1,3 -1,3 +1,6 @@@
  //PWRSPLY:/path/to/device:speed:Name:Type:Channels
  //type can be HMP, PSP, PST
- PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
++
++// PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
+ PWRSPLY:/dev/ttyUSB0:115200:HMP4030:HMP:3
++