Added security, user and role tables to database. set up hibernate.
Merge remote branch 'origin/master'