Added nav rules, added some JSF tags
Resolved conflicts