Move to singular menu struc, better perms handling
Merge remote branch 'origin/7.x-1.x' into 7.x-1.x

Conflicts:
	rpg_site_staff/rpg_site_staff.module