Initial changes to dependencies to build lift against 2.11.0 final
Added scala-xml a dependency starting with scala 2.11.0
Added newer version of scala-jpa
Added scala parser cobinator library as dependencies
Lift-Markdown compiles
Added a Position.scala file which was made private in scala 2.11.0
but they do not offer any replacement and we need it.
Added 2.11.0 as a version we cross compile
Use latest version of combinators library
Modified the default root project, lift-framework, to exclude json_scalaz by default.
Added a new project, `lift-framework-with-scalaz6` which adds json_scalaz and can be used
when you need lift json scalaz that uses scalaz 6

To use it you need to:

1. ++2.10.4
2. project lift-framework-with-scalaz6
3. compile //or any task you need, test, publish-local, etc

This means that from now one, if you work as you used to, you will not be comppiling lift-json-scalaz based on scalaz 6, but instead
you will be using lift-json-scalz7 based on scalaz7
scalaz7 uses 2.11 prefix, not 2.11.0
Merge remote-tracking branch 'origin/master' into diego_scala_2_11

Conflicts:
	build.sbt
	project/Dependencies.scala
Fix a concurrent map conversions in webkit.

ConcurrentMap is now deprecated in favor of concurrent.Map,
and the corresponding Java conversion function has also been
renamed.
Fix webkit Enumerations using deprecated constructor.

We explicitly list out the Value calls now.
Mix in XmlMatchers as needed in specs2.

Specs2 2.x does not mix XmlMatchers into Specification by
default.
Fix visibility issue in S for 2.11.

The private modifier no longer allows access through the
singleton, even from the same instance.
Fix specs2 return type inferencing issues.

specs2 2.x doesn’t seem to handle Unit return types of its
specs automatically, so we have to make sure the last
statement in a spec is always a matcher.
Fix 2.11 issue with type alias variance.

See https://issues.scala-lang.org/browse/SI-6566 for more.
Increase margin for later/ago TimeHelpers specs.
Extend FlatSpec instead of mixing it in.

We do this in a way that will work across both 2.9.x and
2.11 versions of scalatest, which means we have to treat
FlatSpec as a class. Mixing in FlatSpecLike isn’t an option
because the trait doesn’t exist on the 2.9.x version of
scalatest.

To do this properly, we have to instantiate a LineTokenizer
directly in the class rather than being able to extend it in our
test class, since you can’t extend two classes.
Add nasty 2.9.2 compatibility hack.

Scala 2.10 introduced the collection.concurrent.Map
package and class that supersedes ConcurrentMap, and
then 2.11 removed ConcurrentMap altogether.

2.10 also introduced JavaConversions for the new type, and
2.11 removed the old ones. To properly compile in 2.9, we
need a thin layer that provides the new APIs in 2.9 and
transparently calls the old stuff.

Also mucks about thoroughly with the project setup so that
we have a pre-2.11 project that does all the nasty 2.9 slicing
and dicing and a regular project that does everything
2.11-style.
Whoops, don't depend on webkit_compat in 2.11-land.

This was happening because we were calling dependOn on
the webkit project, which apparently modifies it rather than
returning a version with the new dependency. We now make
webkit_pre_211 a full-fledged project of its own.
Add compatible around declaration for specs2 2.x.

specs2 1.x uses around[T <% Result], specs2 2.x uses
around[T: AsResult] with an AsResult invocation around the
block result.
Merge remote-tracking branch 'origin/master' into antonio_scala_2_11

Conflicts:
	core/util/src/test/scala/net/liftweb/util/TimeHelpersSpec.scala