revised master to match local revision
fixed app names in config files