Integrated time manager conky.
Merge remote-tracking branch 'origin/master'

Conflicts:
	itc_kit/mail/email_system.py