Minor Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	jooag_countdown.php
	jooag_countdown.xml