version 2
Merge branch 'master' of https://github.com/carmena/jsf_primerfaces.git