updated to karaf 3.0.2
use java:openjdk-7 as base image
Merge branch 'master' into karaf-4.0

Conflicts:
	Dockerfile