cambio pántalla
Merge remote-tracking branch 'origin/master'

Conflicts:
	BuildServerAdmin/src/com/diners/ui/services/impl/SidebarPageConfigService.java