update changes for eclipse 3.6.2
Merge branch 'master' of https://github.com/thingtrack/konekti.git

Conflicts:
	core/konekti.service.security/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	core/konekti.service.security/src/main/resources/META-INF/spring/bundle-context.xml
	core/konekti.view.web.workbench/pom.xml
	modules/konekti.view.module.modulemanager/pom.xml
recover last workbench