prepare for merge in master and prepare hibernate update schema for deployment on test/ production