Merge pull request #25 from bclozel/gh-pages

update doc on configuration
Merge pull request #31 from bclozel/gh-pages

update documentation for 1.0.0 release
Merge pull request #38 from bclozel/gh-pages

1.1.0 release
update README with new release and Spring reference version
Merge branch 'gh-pages' of github.com:resthub/springmvc-router into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	index.html