up
Merge branch 'master' of https://github.com/szmitas/zpi-desktop

Conflicts:
	src/com/zpi/desktop/init/main.java