Merge remote-tracking branch 'upstream/master'
ignore eclipse .settings
dropwizard-0.7.0-rc2 integration and use SharedMetricsRegistry
Contributors in README
Merge pull request #7 from spinscale/dropwizard-0.7

Integration branch for Dropwizard 0.7.0
seperate dropwizard-jobs-core and dropwizard-jobs-guice modules
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
introduce unit tests for guice module
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dropwizard-jobs-core/src/main/java/de/spinscale/dropwizard/jobs/Job.java
	dropwizard-jobs-core/src/main/java/de/spinscale/dropwizard/jobs/JobManager.java
	dropwizard-jobs-core/src/test/java/de/spinscale/dropwizard/jobs/JobsBundleTest.java
	pom.xml
	src/main/java/de/spinscale/dropwizard/jobs/JobsBundle.java
Introduce Spring DI
Dependency Job tests
Merge branch 'master' of github.com:hakandilek/dropwizard-jobs

# By Hakan Dilek
# Via Hakan Dilek
* 'master' of github.com:hakandilek/dropwizard-jobs:
  Dependency Job tests
  Introduce Spring DI
  introduce unit tests for guice module
  seperate dropwizard-jobs-core and dropwizard-jobs-guice modules
  Contributors in README
  dropwizard-0.7.0-rc2 integration and use SharedMetricsRegistry
  ignore eclipse .settings

Conflicts:
	pom.xml
manually resolved differences in pom conflict