removed unused trait
cleaning up dependencies - removing unused / updated to latest versions
Merge branch 'develop' into scala_2.11

* develop:
  cleaning up dependencies - removing unused / updated to latest versions
  removed unused trait

Conflicts:
	build.sbt