Fixed problem with building for Harmattan
Updated Changelog
Updated Changelog
Merged