branch sem hibernate merge master