fixed the menu based on user access
Merge hub/Spring into Spring

Conflicts:
	src/main/java/commons/Structure.java