fix the hibernate.properties conflict.
Merge branch 'master' of https://github.com/sgyyz/edu-admin