Re-Merge: issue_45_rebased

Regrettably, I was a tiny bit too conservative when cleaning up the code before before releasing it and made two inner bean classes protected which must remain public or JSF can’t access them. Please re-merge this fix.