Upgrade to Scala 2.10.3.
Merge branch 'develop' into topic/scalaz-task

Conflicts:
	build.sbt
Merge branch 'topic/scalaz-task' into topic/scalatra
Proper setter syntax, enabled by SI-7617 fix. Requires Scala 2.10.3.