vMerge branch '2.3' of github.com:scalatra/scalatra-website into 2.3
Added 2.4.x branch.
Merge branch '2.3' of github.com:scalatra/scalatra-website into 2.3
Merge pull request #78 from dozed/2.3

Added note about 2.4.x branch.