upgrade to scalaz 7
Merge branch '2.2.x_2.10' of github.com:/scalatra/scalatra into 2.2.x_2.10
Merge branch '2.2.x_2.10' into develop_2.10

Conflicts:
	commands/src/main/scala/org/scalatra/commands/CommandHandler.scala