Fixed changes made for Java SE 1.6 compliance from commit 68dae1cb014b823f5287b6ff81e920568995ebed
Fixed changes made for Java SE 1.6 compliance from commit 68dae1cb014b823f5287b6ff81e920568995ebed

FredMaris/touist,olzd/touist,touist/touist,touist/touist,touist/touist,olzd/touist,FredMaris/touist,olzd/touist,FredMaris/touist,touist/touist