Merge remote-tracking branch 'origin/master' into lift_30_merge

Conflicts:
	core/actor/src/main/scala/net/liftweb/actor/LAFuture.scala
	core/markdown/src/main/scala/net/liftweb/markdown/InlineParsers.scala
	core/markdown/src/main/scala/net/liftweb/markdown/Transformer.scala
	core/markdown/src/test/scala/net/liftweb/markdown/InlineParsersTest.scala
	persistence/jpa/src/main/scala/net/liftweb/jpa/RequestVarEM.scala
	persistence/mapper/src/main/scala/net/liftweb/mapper/MappedForeignKey.scala
	project/Dependencies.scala
	web/webkit/src/main/scala/net/liftweb/http/CometActor.scala
	web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
	web/webkit/src/main/scala/net/liftweb/http/Req.scala
	web/webkit/src/main/scala/net/liftweb/http/S.scala
	web/webkit/src/main/scala/net/liftweb/sitemap/Loc.scala