User module removed
Remove duplicated includes

Those files are already included
Nav generation simplified
More cleaning after user removal
Merge branch 'pull-request/4'