Merge branch 'master' of https://github.com/lh-dasherz/dapenti

Conflicts:
	src/net/dasherz/dapenti/fragment/PentiBaseFragment.java