Cambios del 12/09/2014
Merge remote-tracking branch 'origin/master'

Conflicts:

	DriveMapBackOfficeDesktop/src/main/java/logic/RegionClientController.java