Upgrade to Scala 2.10.4, parboiled 1.1.6 and specs2 2.3.10
Merge branch 'master' of github.com:spray/spray-json
Prepare for release 1.2.6