buildinfo

Conflicts:
	project/Build.scala

25b9506f959465a1040c0eb0216ad022e6e04623
update dependencies

(cherry picked from commit 6fc7c0c3a7a8eabf0d81641f7b4d869a24790323)
sbt 0.13.6

(cherry picked from commit d077bb223b7528cedae59329e178c4f705b29cab)
Scala 2.11.4

(cherry picked from commit 4cd6b2d35fd3d8e2ddad40f7045b98a51bfd40d1)
fix warning

(cherry picked from commit 7b6e078b76a0fb0b60965360c376589676da87c7)

Conflicts:
	httpz/src/main/scala/ActionOps.scala
	httpz/src/main/scala/Z.scala