Merge pull request #1 from oGLOWo/spray-1.2.0

updating the codebase to use spray 1.2.0 final
Merge branch 'master' into spray-1.2.0