Commit aptana 2
Merge branch 'Sviluppo1'