Merge testrebase

Conflicts:
	README.md
Links in menu in any page
Revert "Links in menu in any page"

This reverts commit 290977007ec3865461670c9c4e0e8fa79bbffb73.
Links in menu in any page
Merge branch 'penelopa'