menu
Merge branch 'Develop' of https://github.com/hugomarin/artBO into Develop

Conflicts:
	view/menu.php