Implemented TISTUD-2010: license in update dialog.
Merge branch 'development' into release

Conflicts:
	features/com.aptana.pydev.feature/feature.xml
APSTUD-5655: Code formatter conflicts with PEP8 E261. Fixed some introduced issues with places where formatting of comments should not take place (shebang line and block comments).
APSTUD-5655: Code formatter conflicts with PEP8 E261. Fixed some introduced issues with places where formatting of comments should not take place (shebang line and block comments).
Fixed the build.
Fixed the build.
TISTUD-3185: updated the copyright to 2013.
Merge branch 'release'
Merged master > development