Merge pull request #27 from Herrie82/master

Code cleanup, launcher & bookmark images
Merge pull request #1 from webOS-ports/master

Merge pull request #27 from Herrie82/master