try
Merge branch 'master' of https://github.com/dante84/faces2spring4.git