add initial OSGI support
add initial OSGI support
* additional Git ignores for IDEA project files
* configurable Spring context class
Merge commit 'af66eceaa0c534d1d0c1149bcde9a271f72f6e01'

Conflicts:
	pom.xml

Merge with upstream