Version 1.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	ThaiToWorldClock (OSX).py
	ThaiToWorldClock (Windows & Linux).py