Description of the application and branches.
Merge branch 'master' into hibernate4