Merge branch 'master' into lugmap.linux.it

Conflicts:
	ToDo

db/campania.txt

@@ -9,6 +9,5 @@ Napoli|MSACK Hacklab|Napoli|http://msack.org/|zfnpx@cnenabvpv.bet
 Napoli|Mudilab|San Giorgio a Cremano|http://www.mudilab.eu/|vasb@zhqvyno.rh
 Napoli|NaLug|Napoli e provincia|http://www.nalug.net/|tvnasv@tznvy.pbz
 Salerno|GuruLug|Sapri|http://gurulug.wordpress.com/|i.prynab@tznvy.pbz
-Salerno|HCSSLUG|Salerno e provincia|http://www.hcsslug.org/|qfynxl@tznvy.pbz|2098656762
 Salerno|Hop Frog|Salerno|http://hopfrog.it/|ghkfn.fnyreab@tznvy.pbz|2098656763
 Salerno|LUGAgropoli|Agropoli|http://www.bitebyte.biz/lugagropoli/|pvppvbf@yvahk.vg|2098656768

db/sicilia.txt

@@ -5,7 +5,6 @@ Catania|CataniaLUG|Catania e provincia|http://catania.linux.it/|yhvtv.gbfpnab@gv
 Catania|EtnaLUG|Provincia di Catania|http://sites.google.com/site/etnalug/|tznemvbm@tznvy.pbz
 Catania|FreakNet MediLab|Catania|http://www.dyne.org/|nforfgb@sernxarg.bet
 Enna|EnnaLUG|Enna|http://leonforte.linux.it/|qbpzvzzb@tznvy.pbz
-Enna|KoreLug|Enna|http://www.korelug.it/|znheb.snvyyn2@ivetvyvb.vg
 Messina|Lug Messina|Messina e provincia|http://www.messinalug.org/|tvbinaav.zreyvab@tznvy.pbz
 Palermo|SputniX|Palermo|http://www.sputnix.it/|ivapramb.ivetvyvb@havcn.vg
 Ragusa|SoLiRa|Ragusa e provincia|http://www.solira.org/|znevb.qvenvzbaqb@tznvy.pbz|2098656830