Merge pull request #7 from nsmathew/settimezone-git

Settimezone git
Corrected category in desktop file
Merge origin/master
Merge pull request #8 from nsmathew/master

Merge settimezone-git