changes
Merge remote-tracking branch 'remotes/origin/master' into JSF2.0+Primefaces3.5