Harmattan tidyup.
Merge branch 'development-harmattan-qt4-pyside' into development
Corrected launch script.