merge conference registration from drzb2011 branch