cleanup include/menu in preparation for the next phase of bookmarking
Merge https://github.com/friendica/red into zpull