Version 2.2 (Preview version)
merging
Merge branch 'master' of https://github.com/frankbonnet/pulsar into development

Conflicts:
	.gitignore
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml