New Styles Zoopa.Clock and Zoopa.Clock.Wide
Merge branch 'master' of https://github.com/olivergeith/java_batteryiconcreator

Conflicts:
	src/de/og/batterycreator/creators/batt/ZoopaClockWide.java