Fix syntax error in pg/gen_kettle_properties.php
Merge thehyve/master into transmart/london_hackaton