MyFaces,Spring, Hibernate
Merge remote-tracking branch 'origin/master'