Merge branch 'development'
Made PyDev JRE 1.6 compatible.
Merge branch 'release'
Merge pull request #54 from aptana/master

Master