Resolved conflicts in some of the .project files. Changed the menu
arrangement in the menu.xhtml.
Removed unwanted file.