encrypt things
Merge origin/master
fixing double Hibernate Session
Merge origin/master
fixing double Hibernate Session
Merge origin/master
fixing double Hibernate Session