fixed null pointer in cp construction
Fixed manifest to cope with assistant factory change.
Merge remote-tracking branch 'origin/development' into ldc/tipi

Conflicts:
	ide/plugins/pog/META-INF/MANIFEST.MF
Merge commit '647b3eb8dc95b2237c2474d01f5ddb00f9cfa95f' into development