Switch to released dependencies.
[maven-release-plugin] prepare release scalate-project_2.9-1.6.0
[maven-release-plugin] prepare for next development iteration
Merge branch 'scala_2.9' into scala_2.10

Conflicts:
	archetypes/pom.xml
	archetypes/scalate-archetype-guice/pom.xml
	archetypes/scalate-archetype-jersey/pom.xml
	archetypes/scalate-archetype-sitegen/pom.xml
	maven-scalate-plugin/pom.xml
	pom.xml
	samples/pom.xml
	samples/scalate-bookstore/pom.xml
	samples/scalate-sample-precompile/pom.xml
	samples/scalate-sample-scuery/pom.xml
	samples/scalate-sample-sitegen/pom.xml
	samples/scalate-sample-spring-mvc/pom.xml
	samples/scalate-sample/pom.xml
	sbt-scalate-plugin/pom.xml
	scalate-camel/pom.xml
	scalate-core/pom.xml
	scalate-distro/pom.xml
	scalate-guice/pom.xml
	scalate-jrebel/pom.xml
	scalate-jruby/pom.xml
	scalate-jsp-converter/pom.xml
	scalate-less/pom.xml
	scalate-markdownj/pom.xml
	scalate-page/pom.xml
	scalate-pegdown/pom.xml
	scalate-spring-mvc/pom.xml
	scalate-test/pom.xml
	scalate-tool/pom.xml
	scalate-util/pom.xml
	scalate-war/pom.xml
	scalate-web/pom.xml
	scalate-website/pom.xml
	scalate-wikitext/pom.xml
Make sure that the Scala compiler targets java 1.7 when it invokes the java compiler.
Merge branch 'scala_2.9' into scala_2.10

* scala_2.9:
  Make sure that the Scala compiler targets java 1.7 when it invokes the java compiler.
Prep fro the 1.6.1 release.
Merge branch 'scala_2.9' into scala_2.10

* scala_2.9:
  Prep fro the 1.6.1 release.
[maven-release-plugin] prepare release scalate-project_2.9-1.6.1
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release scalate-project_2.10-1.6.1
[maven-release-plugin] prepare for next development iteration
Merge branch 'scala_2.9' into scala_2.10

* scala_2.9:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release scalate-project_2.9-1.6.1
Fixed distro and tool for 2.10.
Spring MVC does not work when there is no ServletConfig

One way to initialise the spring context is to use a
org.springframework.web.context.ContextLoaderListener. When you do, there
are not necessarily any configuration parameters for the servlet
in web.xml, so setServletConfig never gets called. However,
initServletContext. The fix for this is to create a fake ServletConfig
and call setServletConfig from initServletContext.

Also, I've added a new example which shows how to use this, along with
simple examples of form submission, adding model attributes and
redirection.
Replace Rhino 1.7R2 with RhinoCoffeeScript (https://github.com/ngocdaothanh/RhinoCoffeeScript), which includes Rhino 1.7R4
Merge pull request #50 from ngocdaothanh/scala_2.10

Replace Rhino 1.7R2 with RhinoCoffeeScript, which includes Rhino 1.7R4
Merge pull request #48 from dozed/scala_2.10

Fixed distro and tool for 2.10.
Fixed some scaml documentation typos.
Merge pull request #52 from joneshf/scala_2.10

Fixed some scaml documentation typos.