ri-uppato 20141208
Merge branch 'master' of https://github.com/BIG93/ids_14_ILoschi.git