conflit
Merge branch 'master' of https://github.com/christian-kocke/cpoa_s3

Conflicts:
	projection/nbproject/private/private.xml